]> code.delx.au - gnu-emacs/commitdiff
merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (16:53 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 1 Nov 2010 07:53:08 +0000 (16:53 +0900)
1  2 
lisp/ChangeLog
lisp/faces.el
src/ChangeLog
src/xterm.c

diff --cc lisp/ChangeLog
index 5d2e442a1c1808de7f7f88b11dd231a3975eb124,42d6c7ece03fd2a97af39124d439495e8438ca83..9be6d045de33c523cedaf2aebd3d8f590b58c6cd
 +2010-11-01  Kenichi Handa  <handa@m17n.org>
 +
 +      * faces.el (glyphless-char): Inherit underline for tty.
 +
 +2010-10-28  Kenichi Handa  <handa@m17n.org>
 +
 +      Implement various display methods for glyphless characters.
 +
 +      * international/characters.el (char-acronym-table): New variable.
 +      (glyphless-char-control): New variable.
 +      (update-glyphless-char-display): New funciton.
 +
 +      * faces.el (glyphless-char): New face.
 +
+ 2010-11-01  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/smie.el (smie): New custom group.
+       (smie-blink-matching-inners, smie-indent-basic): Add :group.
+       * faces.el (xw-defined-colors, x-setup-function-keys):
+       * mouse-sel.el (x-select-text):
+       * term/w32console.el (x-setup-function-keys): Update declarations.
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Declare.
+       * textmodes/ispell.el (comment-add): Declare.
+       * net/gnutls.el (gnutls-boot, gnutls-errorp, gnutls-error-string):
+       Declare.
+       * info.el (finder-keywords-hash, package-alist): Declare.
+ 2010-11-01  Chong Yidong  <cyd@stupidchicken.com>
+       * finder.el (finder-compile-keywords): Don't use intern-soft,
+       since package names may not yet exist in the obarray.
+ 2010-11-01  Chong Yidong  <cyd@stupidchicken.com>
+       * vc/vc-arch.el (vc-arch-checkin):
+       * vc/vc-cvs.el (vc-cvs-checkin):
+       * vc/vc-mtn.el (vc-mtn-checkin):
+       * vc/vc-rcs.el (vc-rcs-checkin):
+       * vc/vc-sccs.el (vc-sccs-checkin):
+       * vc/vc-svn.el (vc-svn-checkin): Remove optional extra arg, unused
+       since 2010-04-21 commit by Stefan Monnier.
+ 2010-11-01  Glenn Morris  <rgm@gnu.org>
+       * emacs-lisp/bytecomp.el (byte-recompile-file): Fix previous change.
+       * startup.el (package-enable-at-startup, package-initialize):
+       Silence compiler.
+       * progmodes/ada-mode.el (ada-font-lock-syntactic-keywords):
+       Silence compiler.
+ 2010-10-31  Julien Danjou  <julien@danjou.info>
+       * emacs-lisp/bytecomp.el (byte-recompile-file): New fun (bug#7297).
+       (byte-recompile-directory):
+       * emacs-lisp/lisp-mode.el (emacs-lisp-byte-compile-and-load):
+       Use `byte-recompile-file'.
+ 2010-10-31  Glenn Morris  <rgm@gnu.org>
+       * cus-start.el: Handle standard values via a keyword.
+       Only set version property if specified.
+       (cursor-in-non-selected-windows, menu-bar-mode)
+       (tool-bar-mode, show-trailing-whitespace):
+       Do not specify standard values.
+       (transient-mark-mode, temporary-file-directory): Use :standard.
+ 2010-10-31  Jan Djärv  <jan.h.d@swipnet.se>
+       * term/x-win.el (x-get-selection-value): New function that gets
+       PRIMARY with type as specified in x-select-request-type. (Bug#6802).
+ 2010-10-31  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-handle-insert-file-contents): For root,
+       preserve owner and group when editing files.  (Bug#7289)
+ 2010-10-31  Glenn Morris  <rgm@gnu.org>
+       * speedbar.el (speedbar-mode):
+       * play/fortune.el (fortune-in-buffer, fortune):
+       * play/gomoku.el (gomoku-mode):
+       * play/landmark.el (lm-mode):
+       * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally):
+       Replace inappropriate uses of toggle-read-only.  (Bug#7292)
+       * select.el (x-selection): Mark it as an obsolete alias.
+ 2010-10-31  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+       * vc/add-log.el (find-change-log): Use derived-mode-p rather than
+       major-mode (bug#7284).
+ 2010-10-31  Glenn Morris  <rgm@gnu.org>
+       * menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
+       rather than just an unused variable that inherits from the real one.
+ 2010-10-31  Alan Mackenzie  <acm@muc.de>
+       * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.
+       This fixes bug #7185.
+ 2010-10-30  Chong Yidong  <cyd@stupidchicken.com>
+       * startup.el (command-line): Search for package directories, and
+       don't load package.el if none are found.
+       * emacs-lisp/package.el (describe-package, list-packages): Call
+       package-initialize if it has not been called yet.
+ 2010-10-30  Alan Mackenzie  <acm@muc.de>
+       * progmodes/cc-fonts.el (c-font-lock-enum-tail): New function
+       which fontifies the tail of an enum.
+       (c-basic-matchers-after): Insert a call to the above new function.
+       This fixes bug #7264.
+ 2010-10-30  Glenn Morris  <rgm@gnu.org>
+       * cus-start.el: Add :set properties for minor modes menu-bar-mode,
+       tool-bar-mode, transient-mark-mode.  (Bug#7306)
+       Include the :set property in the dumped Emacs.
+ 2010-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+       SMIE: change indent rules format, improve smie-setup.
+       * emacs-lisp/smie.el (smie-precs-precedence-table)
+       (smie-merge-prec2s, smie-bnf-precedence-table, smie-prec2-levels):
+       Mark them pure so the tables gets built at compile time.
+       (smie-bnf-precedence-table): Store the closer-alist in the table.
+       (smie-prec2-levels): Preserve the closer-alist.
+       (smie-blink-matching-open): Be more forgiving in case of indentation.
+       (smie-hanging-p): Rename from smie-indent--hanging-p.
+       (smie-bolp): Rename from smie-indent--bolp.
+       (smie--parent, smie--after): New dynamic vars.
+       (smie-parent-p, smie-next-p, smie-prev-p): New funs.
+       (smie-indent-rules): Remove.
+       (smie-indent--offset-rule): Remove fun.
+       (smie-rules-function): New var.
+       (smie-indent--rule): New fun.
+       (smie-indent--offset, smie-indent-keyword, smie-indent-after-keyword)
+       (smie-indent-exps): Use it.
+       (smie-setup): Setup paren blinking; add keyword args for token
+       functions; extract closer-alist from op-levels.
+       (smie-indent-debug-log): Remove var.
+       (smie-indent-debug): Remove fun.
+       * progmodes/prolog.el (prolog-smie-indent-rules): Remove.
+       (prolog-smie-rules): New fun to replace it.
+       (prolog-mode-variables): Simplify.
+       * progmodes/octave-mod.el (octave-smie-closer-alist): Remove, now that
+       it's setup automatically.
+       (octave-smie-indent-rules): Remove.
+       (octave-smie-rules): New fun to replace it.
+       (octave-mode): Simplify.
+ 2010-10-29  Glenn Morris  <rgm@gnu.org>
+       * files.el (temporary-file-directory): Remove (already defined in C).
+       * cus-start.el: Add temporary-file-directory.
+       * abbrev.el (abbrev-mode):
+       * composite.el (auto-composition-mode):
+       * menu-bar.el (menu-bar-mode):
+       * simple.el (transient-mark-mode):
+       * tool-bar.el (tool-bar-mode): Adjust the define-minor-mode calls so
+       that they do not define the associated variables twice.
+       * simple.el (transient-mark-mode): Remove defvar.
+       * composite.el (auto-composition-mode): Make variable auto-buffer-local.
+       * cus-start.el: Add transient-mark-mode, menu-bar-mode, tool-bar-mode.
+       Handle multiple groups, and also custom-delayed-init-variables.
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
+ 2010-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/pcase.el (pcase): New `string' and `guard' patterns.
+       (pcase-if): Add one minor optimization.
+       (pcase-split-equal): Rename from pcase-split-eq.
+       (pcase-split-member): Rename from pcase-split-memq.
+       (pcase-u1): Add strings to the member optimization.
+       Add `guard' variant of predicates.
+       (pcase-q1): Add string patterns.
+ 2010-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred.
  2010-10-28  Glenn Morris  <rgm@gnu.org>
  
        * term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu):
diff --cc lisp/faces.el
Simple merge
diff --cc src/ChangeLog
index 6128808a2a75fd3eb7909bc0fdf523b2defb6df4,00bd97ae29e3cb3849a5aeea946e818d87f0c9fe..3375a46d39ea2a71fdeacce6180e39efb4ef2872
 +2010-11-01  Kenichi Handa  <handa@m17n.org>
 +
 +      * dispextern.h (lookup_glyphless_char_display): Extern it.
 +
 +      * termhooks.h (struct terminal): New member charset_list.
 +
 +      * coding.c (Fset_terminal_coding_system_internal): Set the
 +      `charset_list' member of struct terminal.
 +
 +      * term.c (produce_glyphs): Handle the case it->what ==
 +      IT_GLYPHLESS.
 +      (append_glyphless_glyph, produce_glyphless_glyph): New functions.
 +
 +      * xdisp.c (lookup_glyphless_char_display): Make it non-static.
 +      (lookup_glyphless_char_display): Set it->what at the end.
 +      (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
 +      (last_glyphless_glyph_merged_face_id): Make them non-static.
 +
 +      * w32term.c (x_draw_glyphless_glyph_string_foreground): Fix
 +      the arg with_background for font->driver->draw.
 +
 +2010-10-29  Kenichi Handa  <handa@m17n.org>
 +
 +      * w32gui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Surround
 +      chp by parentheses.
 +
 +2010-10-28  Kenichi Handa  <handa@m17n.org>
 +
 +      Implement various display methods for glyphless characters.
 +
 +      * xdisp.c (Qglyphless_char, Vglyphless_char_display)
 +      (Qglyphless_char_display, Qhexa_code, Qempty_box, Qthin_space)
 +      (Qzero_width): New variables.
 +      (THIN_SPACE_WIDTH): New macro.
 +      (lookup_glyphless_char_display): New funciton.
 +      (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
 +      (last_glyphless_glyph_merged_face_id): New variables.
 +      (get_next_display_element): Check glyphless characters.
 +      (redisplay_internal): Initialize last_glyphless_glyph_frame and
 +      last_glyphless_glyph_face_id.
 +      (fill_glyphless_glyph_string): New function.
 +      (BUILD_GLYPHLESS_GLYPH_STRING): New macro.
 +      (BUILD_GLYPH_STRINGS): Handle the case GLYPHLESS_GLYPH.
 +      (append_glyphless_glyph, produce_glyphless_glyph): New functions.
 +      (x_produce_glyphs): If a suitable font is not found, produce a
 +      glyphless glyph.  Handle the case it->what == IT_GLYPHLESS.
 +      (syms_of_xdisp): Intern and staticpro Qglyphless_char,
 +      Qglyphless_char_display, Qhexa_code, Qempty_box, Qthin_space, and
 +      Qzero_width.
 +      (Vglyphless_char_display): Declare it as a Lisp variable.
 +
 +      * dispextern.h (enum glyph_type): Add GLYPHLESS_GLYPH.
 +      (struct glyph): Change the size of the member "type" to 3.  Add
 +      glyphless to the union slice and u.
 +      (enum display_element_type): Add IT_GLYPHLESS.
 +      (enum glyphless_display_method): New enum.
 +      (struct it): New member glyphless_method.
 +      (Vglyphless_char_display): Extern it.
 +
 +      * xterm.c (x_draw_glyphless_glyph_string_foreground): New function.
 +      (x_draw_glyph_string): Handle the case GLYPHLESS_GLYPH.
 +
 +      * w32term.c (x_draw_glyphless_glyph_string_foreground): New
 +      function.
 +      (x_draw_glyph_string): Handle the case GLYPHLESS_GLYPH.
 +
 +      * nsterm.m (ns_draw_glyph_string): Handle the case
 +      GLYPHLESS_GLYPH (the detail is not yet implemented).
 +
+ 2010-10-31  Glenn Morris  <rgm@gnu.org>
+       * xterm.c (x_connection_closed) [USE_X_TOOLKIT]: Fix merge, maybe.
+       * frame.c (syms_of_frame) <tool-bar-mode>:
+       Default to nil if !HAVE_WINDOW_SYSTEM.  (Bug#7299)
+ 2010-10-31  Chong Yidong  <cyd@stupidchicken.com>
+       * xterm.c (x_connection_closed): Print informative error message
+       when aborting on GTK.  This requires using shut_down_emacs
+       directly instead of Fkill_emacs.
+ 2010-10-31  Michael Albinus  <michael.albinus@gmx.de>
+       * dbusbind.c (Fdbus_call_method_asynchronously)
+       (Fdbus_register_signal, Fdbus_register_method): Check, whether
+       `dbus-registered-objects-table' is initialized.
+ 2010-10-29  Eli Zaretskii  <eliz@gnu.org>
+       * emacs.c (main): Call syms_of_filelock unconditionally.
+       * filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
+       clause, but keep part of it conditioned on CLASH_DETECTION.
+ 2010-10-29  Glenn Morris  <rgm@gnu.org>
+       * nsfns.m (Fx-display-save-under, Fx-open-connection)
+       (Fxw-color-defined-p, Fxw-display-color-p, Fx-show-tip):
+       * w32fns.c (Fxw_color_defined_p, Fx_open_connection):
+       * xfns.c (Fxw_color_defined_p, Fx_open_connection):
+       Sync docs between X, W32, NS.
+       * buffer.c (syms_of_buffer) <abbrev-mode, transient-mark-mode>:
+       * frame.c (syms_of_frame) <tool-bar-mode>: Move doc here from Lisp.
  2010-10-26  Juanma Barranquero  <lekktu@gmail.com>
  
        * eval.c (init_eval_once): Set max_lisp_eval_depth to 600;
diff --cc src/xterm.c
Simple merge