Now on revision 105154. ------------------------------------------------------------ revno: 105154 committer: Jan D. branch nick: trunk timestamp: Wed 2011-07-13 12:36:12 +0200 message: * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26. diff: === modified file 'ChangeLog' --- ChangeLog 2011-07-11 23:13:28 +0000 +++ ChangeLog 2011-07-13 10:36:12 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Jan Djärv + + * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26. + 2011-07-11 YAMAMOTO Mitsuharu * configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin === modified file 'configure.in' --- configure.in 2011-07-11 23:13:28 +0000 +++ configure.in 2011-07-13 10:36:12 +0000 @@ -1987,7 +1987,7 @@ dnl GSettings has been tested under GNU/Linux only. HAVE_GSETTINGS=no if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then - PKG_CHECK_MODULES(GSETTINGS, glib-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) + PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no) if test "$HAVE_GSETTINGS" = "yes"; then AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" ------------------------------------------------------------ revno: 105153 fixes bug(s): http://debbugs.gnu.org/5181 author: Sergei Organov committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-07-13 00:58:34 -0700 message: * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 23:25:50 +0000 +++ lisp/ChangeLog 2011-07-13 07:58:34 +0000 @@ -1,3 +1,8 @@ +2011-07-13 Sergei Organov (tiny change) + + * vc/vc.el (vc-revert-file): + Don't set file time-stamp in the past. (Bug#5181) + 2011-07-12 Lars Magne Ingebrigtsen * files.el (after-find-file): Give a better error message when === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-07-10 01:42:39 +0000 +++ lisp/vc/vc.el 2011-07-13 07:58:34 +0000 @@ -2428,7 +2428,7 @@ (list file) (let ((backup-file (vc-version-backup-file file))) (when backup-file - (copy-file backup-file file 'ok-if-already-exists 'keep-date) + (copy-file backup-file file 'ok-if-already-exists) (vc-delete-automatic-version-backups file)) (vc-call revert file backup-file)) `((vc-state . up-to-date) ------------------------------------------------------------ revno: 105152 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-07-13 00:09:28 -0400 message: src/buffer.c (mmap_find): Fix a typo. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 01:48:43 +0000 +++ src/ChangeLog 2011-07-13 04:09:28 +0000 @@ -1,3 +1,7 @@ +2011-07-13 Eli Zaretskii + + * buffer.c (mmap_find): Fix a typo. + 2011-07-13 Johan Bockgård Fix execution of x selection hooks. === modified file 'src/buffer.c' --- src/buffer.c 2011-07-13 01:15:33 +0000 +++ src/buffer.c 2011-07-13 04:09:28 +0000 @@ -4500,7 +4500,7 @@ is at END - 1. */ static struct mmap_region * -mmap_find (POINTER_TYPE *start, POINTER_TYPE *end); +mmap_find (POINTER_TYPE *start, POINTER_TYPE *end) { struct mmap_region *r; char *s = (char *) start, *e = (char *) end; ------------------------------------------------------------ revno: 105151 committer: Johan Bockgård branch nick: trunk timestamp: Wed 2011-07-13 03:48:43 +0200 message: Fix execution of x selection hooks. * xselect.c (Qx_lost_selection_functions) (Qx_sent_selection_functions): New vars. (syms_of_xselect): DEFSYM them. (x_handle_selection_request): Pass Qx_sent_selection_functions rather than Vx_sent_selection_functions to Frun_hook_with_args. (x_handle_selection_clear,x_clear_frame_selections): Pass Qx_lost_selection_functions rather than Vx_lost_selection_functions to Frun_hook_with_args. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 01:15:33 +0000 +++ src/ChangeLog 2011-07-13 01:48:43 +0000 @@ -1,3 +1,15 @@ +2011-07-13 Johan Bockgård + + Fix execution of x selection hooks. + * xselect.c (Qx_lost_selection_functions) + (Qx_sent_selection_functions): New vars. + (syms_of_xselect): DEFSYM them. + (x_handle_selection_request): Pass Qx_sent_selection_functions + rather than Vx_sent_selection_functions to Frun_hook_with_args. + (x_handle_selection_clear,x_clear_frame_selections): + Pass Qx_lost_selection_functions rather than + Vx_lost_selection_functions to Frun_hook_with_args. + 2011-07-13 Paul Eggert * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking. === modified file 'src/xselect.c' --- src/xselect.c 2011-06-21 02:16:54 +0000 +++ src/xselect.c 2011-07-13 01:48:43 +0000 @@ -112,6 +112,7 @@ static Lisp_Object Qcompound_text_with_extensions; static Lisp_Object Qforeign_selection; +static Lisp_Object Qx_lost_selection_functions, Qx_sent_selection_functions; /* If this is a smaller number than the max-request-size of the display, emacs will use INCR selection transfer when the selection is larger @@ -855,7 +856,7 @@ && !EQ (Vx_sent_selection_functions, Qunbound)) { Lisp_Object args[4]; - args[0] = Vx_sent_selection_functions; + args[0] = Qx_sent_selection_functions; args[1] = selection_symbol; args[2] = target_symbol; args[3] = success ? Qt : Qnil; @@ -979,7 +980,7 @@ /* Run the `x-lost-selection-functions' abnormal hook. */ { Lisp_Object args[2]; - args[0] = Vx_lost_selection_functions; + args[0] = Qx_lost_selection_functions; args[1] = selection_symbol; Frun_hook_with_args (2, args); } @@ -1020,7 +1021,7 @@ { /* Run the `x-lost-selection-functions' abnormal hook. */ Lisp_Object args[2]; - args[0] = Vx_lost_selection_functions; + args[0] = Qx_lost_selection_functions; args[1] = Fcar (Fcar (t->Vselection_alist)); Frun_hook_with_args (2, args); @@ -1033,7 +1034,7 @@ && EQ (frame, XCAR (XCDR (XCDR (XCDR (XCAR (XCDR (rest)))))))) { Lisp_Object args[2]; - args[0] = Vx_lost_selection_functions; + args[0] = Qx_lost_selection_functions; args[1] = XCAR (XCAR (XCDR (rest))); Frun_hook_with_args (2, args); XSETCDR (rest, XCDR (XCDR (rest))); @@ -2679,4 +2680,6 @@ DEFSYM (QNULL, "NULL"); DEFSYM (Qcompound_text_with_extensions, "compound-text-with-extensions"); DEFSYM (Qforeign_selection, "foreign-selection"); + DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions"); + DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions"); } ------------------------------------------------------------ revno: 105150 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-07-12 18:15:33 -0700 message: * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking. The old code sometimes used this field without initializing it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-13 01:04:29 +0000 +++ src/ChangeLog 2011-07-13 01:15:33 +0000 @@ -1,5 +1,8 @@ 2011-07-13 Paul Eggert + * buffer.c (Fget_buffer_create): Initialized inhibit_shrinking. + The old code sometimes used this field without initializing it. + * alloc.c (gc_sweep): Don't read past end of array. In theory, the old code could also have corrupted Emacs internals, though it'd be very unlikely. === modified file 'src/buffer.c' --- src/buffer.c 2011-07-10 08:20:10 +0000 +++ src/buffer.c 2011-07-13 01:15:33 +0000 @@ -361,6 +361,7 @@ BUF_END_UNCHANGED (b) = 0; BUF_BEG_UNCHANGED (b) = 0; *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */ + b->text->inhibit_shrinking = 0; b->newline_cache = 0; b->width_run_cache = 0; ------------------------------------------------------------ revno: 105149 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-07-12 18:04:29 -0700 message: * alloc.c (gc_sweep): Don't read past end of array. In theory, the old code could also have corrupted Emacs internals, though it'd be very unlikely. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-12 21:17:39 +0000 +++ src/ChangeLog 2011-07-13 01:04:29 +0000 @@ -1,3 +1,9 @@ +2011-07-13 Paul Eggert + + * alloc.c (gc_sweep): Don't read past end of array. + In theory, the old code could also have corrupted Emacs internals, + though it'd be very unlikely. + 2011-07-12 Andreas Schwab * character.c (Fcharacterp): Don't advertise optional ignored === modified file 'src/alloc.c' --- src/alloc.c 2011-07-10 08:52:10 +0000 +++ src/alloc.c 2011-07-13 01:04:29 +0000 @@ -5733,7 +5733,7 @@ int ilim = (lim + BITS_PER_INT - 1) / BITS_PER_INT; /* Scan the mark bits an int at a time. */ - for (i = 0; i <= ilim; i++) + for (i = 0; i < ilim; i++) { if (cblk->gcmarkbits[i] == -1) { ------------------------------------------------------------ revno: 105148 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 01:25:50 +0200 message: Give better error messages when trying to load non-existent symlinks * files.el (after-find-file): Give a better error message when trying to find a symlink that points to a file that doesn't exist (bug#4398). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 23:19:33 +0000 +++ lisp/ChangeLog 2011-07-12 23:25:50 +0000 @@ -1,5 +1,9 @@ 2011-07-12 Lars Magne Ingebrigtsen + * files.el (after-find-file): Give a better error message when + trying to find a symlink that points to a file that doesn't exist + (bug#4398). + * progmodes/cc-vars.el: Remove (probably) misleading comment (bug#4396). === modified file 'lisp/files.el' --- lisp/files.el 2011-07-11 13:56:49 +0000 +++ lisp/files.el 2011-07-12 23:25:50 +0000 @@ -2060,7 +2060,11 @@ ((not warn) nil) ((and error (file-attributes buffer-file-name)) (setq buffer-read-only t) - "File exists, but cannot be read") + (if (and (file-symlink-p buffer-file-name) + (not (file-exists-p + (file-chase-links buffer-file-name)))) + "Symbolic link that points to nonexistent file" + "File exists, but cannot be read")) ((not buffer-read-only) (if (and warn ;; No need to warn if buffer is auto-saved ------------------------------------------------------------ revno: 105147 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 01:19:33 +0200 message: * progmodes/cc-vars.el: Remove (probably) misleading comment diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 21:59:09 +0000 +++ lisp/ChangeLog 2011-07-12 23:19:33 +0000 @@ -1,3 +1,8 @@ +2011-07-12 Lars Magne Ingebrigtsen + + * progmodes/cc-vars.el: Remove (probably) misleading comment + (bug#4396). + 2011-07-12 Johan Bockgård * mouse-sel.el (mouse-sel-primary-overlay): Use the `region' face. === modified file 'lisp/progmodes/cc-vars.el' --- lisp/progmodes/cc-vars.el 2011-01-26 08:36:39 +0000 +++ lisp/progmodes/cc-vars.el 2011-07-12 23:19:33 +0000 @@ -1633,8 +1633,7 @@ ;; It isn't possible to specify a doc-string without specifying an ;; initial value with `defvar', so the following two variables have been ;; given doc-strings by setting the property `variable-documentation' -;; directly. C-h v will read this documentation only for versions of GNU -;; Emacs from 22.1. It's really good not to have an initial value for +;; directly. It's really good not to have an initial value for ;; variables like these that always should be dynamically bound, so it's ;; worth the inconvenience. ------------------------------------------------------------ revno: 105146 fixes bug(s): http://debbugs.gnu.org/4345 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 00:39:21 +0200 message: (Table Recognition): Use "at point" instead of "under point" diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-12 22:37:20 +0000 +++ doc/emacs/ChangeLog 2011-07-12 22:39:21 +0000 @@ -1,5 +1,8 @@ 2011-07-12 Lars Magne Ingebrigtsen + * text.texi (Table Recognition): Use "at point" instead of "under + point" (bug#4345). + * display.texi (Cursor Display): Mention `cursor-type'. * screen.texi (Point): Clarify that it's only if you use a block === modified file 'doc/emacs/text.texi' --- doc/emacs/text.texi 2011-07-10 03:11:47 +0000 +++ doc/emacs/text.texi 2011-07-12 22:39:21 +0000 @@ -2506,16 +2506,16 @@ Deactivate tables within the current region. @findex table-recognize-table @item M-x table-recognize-table -Recognize the table under point and activate it. +Recognize the table at point and activate it. @findex table-unrecognize-table @item M-x table-unrecognize-table -Deactivate the table under point. +Deactivate the table at point. @findex table-recognize-cell @item M-x table-recognize-cell -Recognize the cell under point and activate it. +Recognize the cell at point and activate it. @findex table-unrecognize-cell @item M-x table-unrecognize-cell -Deactivate the cell under point. +Deactivate the cell at point. @end table For another way of converting text into tables, see @ref{Table ------------------------------------------------------------ revno: 105145 fixes bug(s): http://debbugs.gnu.org/4345 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-07-13 00:37:20 +0200 message: Manual fixes related to clarifying cursor shapes diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-12 15:29:27 +0000 +++ doc/emacs/ChangeLog 2011-07-12 22:37:20 +0000 @@ -1,3 +1,10 @@ +2011-07-12 Lars Magne Ingebrigtsen + + * display.texi (Cursor Display): Mention `cursor-type'. + + * screen.texi (Point): Clarify that it's only if you use a block + cursor that it appears to be on a character (bug#4345). + 2011-07-12 Chong Yidong * misc.texi (Amusements): Move dissociated press here, from its === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-07-03 21:33:54 +0000 +++ doc/emacs/display.texi 2011-07-12 22:37:20 +0000 @@ -1211,6 +1211,10 @@ You can control how the cursor appears when it blinks off by setting the variable @code{blink-cursor-alist}. +@vindex cursor-type + You can change the shape of the cursor from the default ``box'' look +to a bar by altering the @code{cursor-type} variable. + @vindex visible-cursor Some text terminals offer two different cursors: the normal cursor and the very visible cursor, where the latter may be e.g. bigger or === modified file 'doc/emacs/screen.texi' --- doc/emacs/screen.texi 2011-07-10 14:40:21 +0000 +++ doc/emacs/screen.texi 2011-07-12 22:37:20 +0000 @@ -73,14 +73,14 @@ clicking mouse button 1 (normally the left button) at the desired location. - While the cursor appears to be @emph{on} a character, you should -think of point as @emph{between} two characters; it points @emph{before} -the character that appears under the cursor. For example, if your text -looks like @samp{frob} with the cursor over the @samp{b}, then point is -between the @samp{o} and the @samp{b}. If you insert the character -@samp{!} at that position, the result is @samp{fro!b}, with point -between the @samp{!} and the @samp{b}. Thus, the cursor remains over -the @samp{b}, as before. + If you use a block cursor, the cursor appears to be @emph{on} a +character, but you should think of point as @emph{between} two +characters; it points @emph{before} the character that appears under +the cursor. For example, if your text looks like @samp{frob} with the +cursor over the @samp{b}, then point is between the @samp{o} and the +@samp{b}. If you insert the character @samp{!} at that position, the +result is @samp{fro!b}, with point between the @samp{!} and the +@samp{b}. Thus, the cursor remains over the @samp{b}, as before. Sometimes people speak of ``the cursor'' when they mean ``point,'' or speak of commands that move point as ``cursor motion'' commands. @@ -92,12 +92,14 @@ its own point location. If the same buffer appears in more than one window, each window has its own point position in that buffer. - On a graphical display, Emacs shows a cursor in each window; the -selected window's cursor is solid and blinking, and the other cursors -are hollow. On a text-only terminal, there is just one cursor, in the -selected window; even though the unselected windows have their own -point positions, they do not display a cursor. @xref{Cursor Display}, -for customizable variables that control cursor display. + On a graphical display, Emacs shows a cursor in each window. The +selected window's cursor will be blinking. If you use the default, +@code{box} cursor type, the selected window's cursor will be solid, +and the other cursors are hollow. On a text-only terminal, there is +just one cursor, in the selected window; even though the unselected +windows have their own point positions, they do not display a cursor. +@xref{Cursor Display}, for customizable variables that control cursor +display. @node Echo Area @section The Echo Area ------------------------------------------------------------ revno: 105144 fixes bug(s): http://debbugs.gnu.org/4178 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 18:09:28 -0400 message: Minor xref additions to Lisp manual. * doc/lispref/display.texi (Face Attributes, Font Selection): Add references to the Fonts node in the Emacs manual. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-12 17:33:18 +0000 +++ doc/lispref/ChangeLog 2011-07-12 22:09:28 +0000 @@ -1,5 +1,10 @@ 2011-07-12 Chong Yidong + * display.texi (Face Attributes, Font Selection): Add references + to the Fonts node in the Emacs manual (Bug#4178). + +2011-07-12 Chong Yidong + * display.texi (Window Systems): `window-system' is terminal-local. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-07-12 17:33:18 +0000 +++ doc/lispref/display.texi 2011-07-12 22:09:28 +0000 @@ -1800,9 +1800,9 @@ @cindex faces A @dfn{face} is a collection of graphical attributes for displaying -text: font family, foreground color, background color, optional -underlining, and so on. Faces control how buffer text is displayed, -and how some parts of the frame, such as the mode-line, are displayed. +text: font, foreground color, background color, optional underlining, +and so on. Faces control how buffer text is displayed, and how some +parts of the frame, such as the mode-line, are displayed. @xref{Standard Faces,,, emacs, The GNU Emacs Manual}, for the list of faces Emacs normally comes with. @@ -2001,16 +2001,17 @@ @table @code @item :family -Font family name or fontset name (a string). If you specify a font -family name, the wild-card characters @samp{*} and @samp{?} are -allowed. The function @code{font-family-list}, described below, -returns a list of available family names. @xref{Fontsets}, for -information about fontsets. +Font family or fontset (a string). @xref{Fonts,,, emacs, The GNU +Emacs Manual}. If you specify a font family name, the wild-card +characters @samp{*} and @samp{?} are allowed. The function +@code{font-family-list}, described below, returns a list of available +family names. @xref{Fontsets}, for information about fontsets. @item :foundry -The name of the @dfn{font foundry} in which the font family specified -by the @code{:family} attribute is located (a string). The wild-card -characters @samp{*} and @samp{?} are allowed. +The name of the @dfn{font foundry} for the font family specified by +the @code{:family} attribute (a string). The wild-card characters +@samp{*} and @samp{?} are allowed. @xref{Fonts,,, emacs, The GNU +Emacs Manual}. @item :width Relative proportionate character width, also known as the character @@ -2684,14 +2685,15 @@ Before Emacs can draw a character on a particular display, it must select a @dfn{font} for that character@footnote{In this context, the term @dfn{font} has nothing to do with Font Lock (@pxref{Font Lock -Mode}).}. Normally, Emacs automatically chooses a font based on the -faces assigned to that character---specifically, the face attributes -@code{:family}, @code{:weight}, @code{:slant}, and @code{:width} -(@pxref{Face Attributes}). The choice of font also depends on the -character to be displayed; some fonts can only display a limited set -of characters. If no available font exactly fits the requirements, -Emacs looks for the @dfn{closest matching font}. The variables in -this section control how Emacs makes this selection. +Mode}).}. @xref{Fonts,,, emacs, The GNU Emacs Manual}. Normally, +Emacs automatically chooses a font based on the faces assigned to that +character---specifically, the face attributes @code{:family}, +@code{:weight}, @code{:slant}, and @code{:width} (@pxref{Face +Attributes}). The choice of font also depends on the character to be +displayed; some fonts can only display a limited set of characters. +If no available font exactly fits the requirements, Emacs looks for +the @dfn{closest matching font}. The variables in this section +control how Emacs makes this selection. @defopt face-font-family-alternatives If a given family is specified but does not exist, this variable ------------------------------------------------------------ revno: 105143 committer: Johan Bockgård branch nick: trunk timestamp: Tue 2011-07-12 23:59:09 +0200 message: * mouse-sel.el (mouse-sel-primary-overlay): Use the `region' face. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 18:59:48 +0000 +++ lisp/ChangeLog 2011-07-12 21:59:09 +0000 @@ -1,3 +1,7 @@ +2011-07-12 Johan Bockgård + + * mouse-sel.el (mouse-sel-primary-overlay): Use the `region' face. + 2011-07-12 Chong Yidong * mouse-sel.el: Hack restoring functionality, while keeping === modified file 'lisp/mouse-sel.el' --- lisp/mouse-sel.el 2011-07-12 18:59:48 +0000 +++ lisp/mouse-sel.el 2011-07-12 21:59:09 +0000 @@ -279,7 +279,7 @@ (defconst mouse-sel-primary-overlay (let ((ol (make-overlay (point-min) (point-min)))) (delete-overlay ol) - (overlay-put ol 'face 'secondary-selection) + (overlay-put ol 'face 'region) ol) "An overlay which records the current primary selection. This is used by Mouse Sel mode only.") ------------------------------------------------------------ revno: 105142 committer: Andreas Schwab branch nick: emacs timestamp: Tue 2011-07-12 23:17:39 +0200 message: * src/character.c (Fcharacterp): Don't advertise optional ignored argument. (Bug#4026) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-12 21:12:36 +0000 +++ src/ChangeLog 2011-07-12 21:17:39 +0000 @@ -1,3 +1,8 @@ +2011-07-12 Andreas Schwab + + * character.c (Fcharacterp): Don't advertise optional ignored + argument. (Bug#4026) + 2011-07-12 Lars Magne Ingebrigtsen * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier === modified file 'src/character.c' --- src/character.c 2011-06-14 18:57:19 +0000 +++ src/character.c 2011-07-12 21:17:39 +0000 @@ -258,7 +258,8 @@ } DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0, - doc: /* Return non-nil if OBJECT is a character. */) + doc: /* Return non-nil if OBJECT is a character. +usage: (characterp OBJECT) */) (Lisp_Object object, Lisp_Object ignore) { return (CHARACTERP (object) ? Qt : Qnil); ------------------------------------------------------------ revno: 105141 fixes bug(s): http://debbugs.gnu.org/4257 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2011-07-12 23:12:36 +0200 message: (syms_of_keymap): Clarify that "modifier" is "modifier key" diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-12 21:09:01 +0000 +++ src/ChangeLog 2011-07-12 21:12:36 +0000 @@ -1,5 +1,8 @@ 2011-07-12 Lars Magne Ingebrigtsen + * keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier + key" (bug#4257). + * window.c (Fset_window_start): Doc fix (bug#4199). (Fset_window_hscroll): Ditto. === modified file 'src/keymap.c' --- src/keymap.c 2011-07-07 17:19:10 +0000 +++ src/keymap.c 2011-07-12 21:12:36 +0000 @@ -3712,11 +3712,11 @@ Vemulation_mode_map_alists = Qnil; DEFVAR_LISP ("where-is-preferred-modifier", Vwhere_is_preferred_modifier, - doc: /* Preferred modifier to use for `where-is'. + doc: /* Preferred modifier key to use for `where-is'. When a single binding is requested, `where-is' will return one that -uses this modifier if possible. If nil, or if no such binding exists, -bindings using keys without modifiers (or only with meta) will be -preferred. */); +uses this modifier key if possible. If nil, or if no such binding +exists, bindings using keys without modifiers (or only with meta) will +be preferred. */); Vwhere_is_preferred_modifier = Qnil; where_is_preferred_modifier = 0; ------------------------------------------------------------ revno: 105140 fixes bug(s): http://debbugs.gnu.org/4199 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2011-07-12 23:09:01 +0200 message: window.c doc fixes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-12 17:29:33 +0000 +++ src/ChangeLog 2011-07-12 21:09:01 +0000 @@ -1,3 +1,8 @@ +2011-07-12 Lars Magne Ingebrigtsen + + * window.c (Fset_window_start): Doc fix (bug#4199). + (Fset_window_hscroll): Ditto. + 2011-07-12 Paul Eggert Fix minor new problems caught by GCC 4.6.1. === modified file 'src/window.c' --- src/window.c 2011-07-02 10:36:48 +0000 +++ src/window.c 2011-07-12 21:09:01 +0000 @@ -683,6 +683,7 @@ DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0, doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL. +If WINDOW is nil, the selected window is used. Return NCOL. NCOL should be zero or positive. Note that if `automatic-hscrolling' is non-nil, you cannot scroll the @@ -1410,7 +1411,7 @@ DEFUN ("set-window-start", Fset_window_start, Sset_window_start, 2, 3, 0, doc: /* Make display in WINDOW start at position POS in WINDOW's buffer. -WINDOW defaults to the selected window. Return POS. +If WINDOW is nil, the selected window is used. Return POS. Optional third arg NOFORCE non-nil inhibits next redisplay from overriding motion of point in order to display at this exact start. */) (Lisp_Object window, Lisp_Object pos, Lisp_Object noforce) ------------------------------------------------------------ revno: 105139 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 15:39:01 -0400 message: Add Bug#2490 testcase to compilation.txt. diff: === modified file 'etc/compilation.txt' --- etc/compilation.txt 2011-07-03 21:39:49 +0000 +++ etc/compilation.txt 2011-07-12 19:39:01 +0000 @@ -254,6 +254,7 @@ foo.c:8-23: message foo.c:8-45.3: message foo.c:8.23-9.1: message +foo.el:3:1:Error: End of file during parsing jade:dbcommon.dsl:133:17:E: missing argument for function call G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.