From e7a3ff06b31baa4e344e0a0b1addde57c16c817f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 24 Oct 2011 10:01:54 +0800 Subject: [PATCH 01/21] Document scroll-up-line and scroll-down-line in Emacs manual. * doc/emacs/display.texi (Scrolling): Document scroll-up-line and scroll-down-line. Document scroll-command property. (Recentering): New node, split off from Scrolling. Also, minor copyedits to standardize on the phrase "key binding" rather than "keybinding" in the manual. --- doc/emacs/ChangeLog | 6 ++ doc/emacs/display.texi | 175 ++++++++++++++++++++++------------------ doc/emacs/emacs.texi | 1 + doc/emacs/kmacro.texi | 2 +- doc/emacs/macos.texi | 2 +- doc/emacs/programs.texi | 2 +- doc/emacs/rmail.texi | 11 +-- doc/emacs/search.texi | 4 +- etc/NEWS | 2 +- 9 files changed, 116 insertions(+), 89 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 28c61e23b8c..a1310e87b15 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-10-24 Chong Yidong + + * display.texi (Scrolling): Document scroll-up-line and + scroll-down-line. Document scroll-command property. + (Recentering): New node, split off from Scrolling. + 2011-10-23 Chong Yidong * frames.texi (Scroll Bars): GTK uses right scroll bars now. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index b72e24bf243..8995b1242b1 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -13,6 +13,7 @@ the text is displayed. @menu * Scrolling:: Commands to move text up and down in a window. +* Recentering:: A scroll command that centers the current line. * Auto Scrolling:: Redisplay scrolls text automatically when needed. * Horizontal Scrolling:: Moving text left and right in a window. * Narrowing:: Restricting display and editing to a portion @@ -48,15 +49,15 @@ portion of the buffer is displayed. Scrolling ``forward'' or ``up'' advances the portion of the buffer displayed in the window; equivalently, it moves the buffer text upwards relative to the window. Scrolling ``backward'' or ``down'' -moves the displayed portion backwards, and moves the text downwards -relative to the window. In Emacs, scrolling ``up'' or ``down'' refers -to the direction that the text moves in the window, @emph{not} the -direction that the window moves relative to the text; this terminology -was taken up by Emacs before the modern meaning of ``scrolling up'' -and ``scrolling down'' became widely adopted. Hence the strange -result that @key{PageDown} scrolls ``up'' in the Emacs sense. In this -manual, we refer to scrolling ``forward'' and ``backward'' where -possible, in order to minimize confusion. +displays an earlier portion of the buffer, and moves the text +downwards relative to the window. + + In Emacs, scrolling ``up'' or ``down'' refers to the direction that +the text moves in the window, @emph{not} the direction that the window +moves relative to the text. This terminology was adopted by Emacs +before the modern meaning of ``scrolling up'' and ``scrolling down'' +became widespread. Hence, the strange result that @key{PageDown} +scrolls ``up'' in the Emacs sense. The portion of a buffer displayed in a window always contains point. If you move point past the bottom or top of the window, scrolling @@ -64,11 +65,6 @@ occurs automatically to bring it back onscreen (@pxref{Auto Scrolling}). You can also scroll explicitly with these commands: @table @kbd -@item C-l -Scroll the selected window so that the current line is the center-most -text line; on subsequent consecutive invocations, make the current -line the top-most line, the bottom-most line, and so on in cyclic -order; also, maybe redisplay the screen (@code{recenter-top-bottom}). @item C-v @itemx @key{next} @itemx @key{PageDown} @@ -77,6 +73,86 @@ Scroll forward by nearly a full window (@code{scroll-up-command}). @itemx @key{prior} @itemx @key{PageUp} Scroll backward (@code{scroll-down-command}). +@end table + +@kindex C-v +@kindex M-v +@kindex next +@kindex prior +@kindex PageDown +@kindex PageUp +@findex scroll-up-command +@findex scroll-down-command + @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the +whole window height. The effect is to take the two lines at the +bottom of the window and put them at the top, followed by lines that +were not previously visible. If point was in the text that scrolled +off the top, it ends up on the window's new topmost line. The +@key{next} (or @key{PageDown}) key is equivalent to @kbd{C-v}. + + @kbd{M-v} (@code{scroll-down-command}) scrolls backward in a similar +way. The @key{prior} (or @key{PageUp}) key is equivalent to +@kbd{M-v}. + +@vindex next-screen-context-lines + The number of lines of overlap left by these scroll commands is +controlled by the variable @code{next-screen-context-lines}, whose +default value is 2. You can supply the commands with a numeric prefix +argument, @var{n}, to scroll by @var{n} lines; Emacs attempts to leave +point unchanged, so that the text and point move up or down together. +@kbd{C-v} with a negative argument is like @kbd{M-v} and vice versa. + +@vindex scroll-error-top-bottom + By default, these commands signal an error (by beeping or flashing +the screen) if no more scrolling is possible, because the window has +reached the beginning or end of the buffer. If you change the +variable @code{scroll-error-top-bottom} to @code{t}, the command moves +point to the farthest possible position. If point is already there, +the command signals an error. + +@vindex scroll-preserve-screen-position +@cindex @code{scroll-command} property + Some users like scroll commands to keep point at the same screen +position, so that scrolling back to the same screen conveniently +returns point to its original position. You can enable this behavior +via the variable @code{scroll-preserve-screen-position}. If the value +is @code{t}, Emacs adjusts point to keep the cursor at the same screen +position whenever a scroll command moves it off-window, rather than +moving it to the topmost or bottommost line. With any other +non-@code{nil} value, Emacs adjusts point this way even if the scroll +command leaves point in the window. This variable affects all the +scroll commands documented in this section, as well as scrolling with +the mouse wheel (@pxref{Wheeled Mice}); in general, it affects any +command that has a non-@code{nil} @code{scroll-command} property. +@xref{Property Lists,,, elisp, The Emacs Lisp Reference Manual}. + +@vindex scroll-up +@vindex scroll-down +@findex scroll-up-line +@findex scroll-down-line + The commands @kbd{M-x scroll-up} and @kbd{M-x scroll-down} behave +similarly to @code{scroll-up-command} and @code{scroll-down-command}, +except they do not obey @code{scroll-error-top-bottom}. Prior to +Emacs 24, these were the default commands for scrolling up and down. +The commands @kbd{M-x scroll-up-line} and @kbd{M-x scroll-down-line} +scroll the current window by one line at a time. If you intend to use +any of these commands, you might want to give them key bindings +(@pxref{Init Rebinding}). + +@node Recentering +@section Recentering + +@table @kbd +@item C-l +Scroll the selected window so the current line is the center-most text +line; on subsequent consecutive invocations, make the current line the +top line, the bottom line, and so on in cyclic order. Possibly +redisplay the screen too (@code{recenter-top-bottom}). + +@item M-x recenter +Scroll the selected window so the current line is the center-most text +line. Possibly redisplay the screen too. + @item C-M-l Scroll heuristically to bring useful information onto the screen (@code{reposition-window}). @@ -107,14 +183,13 @@ non-zero value @var{n}, @kbd{C-l} always leaves at least @var{n} screen lines between point and the top or bottom of the window (@pxref{Auto Scrolling}). - You can also supply @kbd{C-l} with a prefix argument. With a plain -prefix argument, @kbd{C-u C-l}, Emacs simply recenters point. With a -positive argument @var{n}, it scrolls to place point @var{n} lines -down from the top of the window. An argument of zero puts point on -the topmost line. A negative argument @var{-n} puts point @var{n} -lines from the bottom of the window. When given an argument, -@kbd{C-l} does not clear the screen or cycle through different screen -positions. + You can also give @kbd{C-l} a prefix argument. A plain prefix +argument, @kbd{C-u C-l}, simply recenters point. A positive argument +@var{n} puts point @var{n} lines down from the top of the window. An +argument of zero puts point on the topmost line. A negative argument +@var{-n} puts point @var{n} lines from the bottom of the window. When +given an argument, @kbd{C-l} does not clear the screen or cycle +through different screen positions. @vindex recenter-redisplay If the variable @code{recenter-redisplay} has a non-@code{nil} @@ -127,62 +202,6 @@ becomes garbled for any reason (@pxref{Screen Garbled}). The more primitive command @kbd{M-x recenter} behaves like @code{recenter-top-bottom}, but does not cycle among screen positions. -@kindex C-v -@kindex M-v -@kindex next -@kindex prior -@kindex PageDown -@kindex PageUp -@findex scroll-up-command -@findex scroll-down-command - @kbd{C-v} (@code{scroll-up-command}) scrolls forward by nearly the -whole window height. The effect is to take the two lines at the -bottom of the window and put them at the top, followed by lines that -were not previously visible. If point was in the text that scrolled -off the top, it ends up on the window's new topmost line. - - Similarly, @kbd{M-v} (@code{scroll-down-command}) scrolls backward. - - We refer to @kbd{C-v} and @kbd{M-v} as @dfn{full-screen scroll -commands}. The function key @key{next}, or @key{PageDown}, is -equivalent to @kbd{C-v}; the function key @key{prior}, or -@key{PageUp}, is equivalent to @kbd{M-v}. - -@vindex next-screen-context-lines - The variable @code{next-screen-context-lines} controls the number of -lines of overlap left by the full-screen scroll commands; by default, -it is 2. You can supply these commands with a numeric prefix argument -@var{n}. This scrolls the window by @var{n} lines, while attempting -to leave point unchanged (so that the text and point move up or down -together). @kbd{C-v} with a negative argument is like @kbd{M-v} and -vice versa. - -@vindex scroll-error-top-bottom - By default, the full-screen scroll commands signal an error (by -beeping or flashing the screen) if no more scrolling is possible, -because the window has reached the beginning or end of the buffer. If -you change the variable @code{scroll-error-top-bottom} to @code{t}, -Emacs instead moves point to the farthest possible position. If point -is already there, the command signals an error. - -@vindex scroll-preserve-screen-position - Some users like scroll commands to keep point at the same screen -position. Then, scrolling back to the same screen also conveniently -returns point to its original position. You can enable this via the -variable @code{scroll-preserve-screen-position}. If the value is -@code{t}, Emacs adjusts point to keep it at the same vertical position -within the window, rather than the window edge, whenever a scroll -command moves it off the window. With any other non-@code{nil} value, -Emacs adjusts point this way even if the scroll command leaves point -in the window. - -@vindex scroll-up -@vindex scroll-down - The commands @code{scroll-up} and @code{scroll-down} behave -similarly to @code{scroll-up-command} and @code{scroll-down-command}, -except they do not obey @code{scroll-error-top-bottom}. Prior to -Emacs 24, these were the default commands for scrolling up and down. - @kindex C-M-l @findex reposition-window @kbd{C-M-l} (@code{reposition-window}) scrolls the current window diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index cad0e4db3c0..b25c09aa29d 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -342,6 +342,7 @@ Registers Controlling the Display * Scrolling:: Commands to move text up and down in a window. +* Recentering:: A scrolling command that centers the current line. * Auto Scrolling:: Redisplay scrolls text automatically when needed. * Horizontal Scrolling:: Moving text left and right in a window. * Narrowing:: Restricting display and editing to a portion diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index ac81377aec9..4676983fc67 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -147,7 +147,7 @@ beginning of the line and then executing the macro. @findex kmacro-start-macro @findex kmacro-end-macro In addition to the @key{F3} and @key{F4} commands described above, -Emacs also supports an older set of keybindings for defining and +Emacs also supports an older set of key bindings for defining and executing keyboard macros. To begin a macro definition, type @kbd{C-x (} (@code{kmacro-start-macro}); as with @key{F3}, a prefix argument appends this definition to the last keyboard macro. To end a macro diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index f4a5a2858cf..5a97fa8460b 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -36,7 +36,7 @@ Support}), but we hope to improve it in the future. By default, the @key{alt} and @key{option} keys are the same as @key{Meta}. The Mac @key{Cmd} key is the same as @key{Super}, and -Emacs provides a set of keybindings using this modifier key that mimic +Emacs provides a set of key bindings using this modifier key that mimic other Mac / GNUstep applications (@pxref{Mac / GNUstep Events}). You can change these bindings in the usual way (@pxref{Key Bindings}). diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 5745dd7c66c..2357902341e 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1441,7 +1441,7 @@ parsed, and move point there (@code{semantic-complete-jump}). @kindex C-c , @key{SPC} Display a list of possible completions for the symbol at point (@code{semantic-complete-analyze-inline}). This also activates a set -of special keybindings for choosing a completion: @key{RET} accepts +of special key bindings for choosing a completion: @key{RET} accepts the current completion, @kbd{M-n} and @kbd{M-p} cycle through possible completions, @key{TAB} completes as far as possible and then cycles, and @kbd{C-g} or any other key aborts completion. diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 9e30b657284..71c23655608 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1242,11 +1242,12 @@ coding system, the result should be readable. @node Rmail Editing @section Editing Within a Message - Most of the usual Emacs keybindings are available in Rmail mode, though a -few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by Rmail for -other purposes. However, the Rmail buffer is normally read only, and -most of the letters are redefined as Rmail commands. If you want to -edit the text of a message, you must use the Rmail command @kbd{e}. + Most of the usual Emacs key bindings are available in Rmail mode, +though a few, such as @kbd{C-M-n} and @kbd{C-M-h}, are redefined by +Rmail for other purposes. However, the Rmail buffer is normally read +only, and most of the letters are redefined as Rmail commands. If you +want to edit the text of a message, you must use the Rmail command +@kbd{e}. @table @kbd @item e diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 31b5aa37f83..a8bd1cdf18d 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -268,8 +268,8 @@ use it (@pxref{Rebinding}). @vindex isearch-mode-map When incremental search is active, you can type @kbd{C-h C-h} to -access interactive help options, including a list of special -keybindings. These keybindings are part of the keymap +access interactive help options, including a list of special key +bindings. These key bindings are part of the keymap @code{isearch-mode-map} (@pxref{Keymaps}). @node Isearch Yank diff --git a/etc/NEWS b/etc/NEWS index 24aea694902..d6b0bdb484c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -293,7 +293,7 @@ of buffer at first key-press (instead move to top/bottom of buffer) when `scroll-error-top-bottom' is non-nil. +++ *** New variable `scroll-error-top-bottom' (see above). - ++++ *** New scrolling commands `scroll-up-line' and `scroll-down-line' scroll a line instead of full screen. +++ From 08c7586636dca746d777865287f7c92cfaffd92b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 23 Oct 2011 22:03:24 -0400 Subject: [PATCH 02/21] * subr.el (apply-partially): Remove redundant comment. --- lisp/subr.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/lisp/subr.el b/lisp/subr.el index 05ac198dd13..c88cef0ba0f 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -116,8 +116,6 @@ BODY should be a list of Lisp expressions. ;; depend on backquote.el. (list 'function (cons 'lambda cdr))) -;; Partial application of functions (similar to "currying"). -;; This function is here rather than in subr.el because it uses CL. (defun apply-partially (fun &rest args) "Return a function that is a partial application of FUN to ARGS. ARGS is a list of the first N arguments to pass to FUN. From e782cfabe70f10d62c0a1eb6f1eeed74a86d6c2d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 23 Oct 2011 19:40:23 -0700 Subject: [PATCH 03/21] * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) if the library is found. Otherwise, later configure-time tests, such as the test for pthread_sigmask, generate the wrong results on some platforms. Problem reported for FreeBSD by Nali Toja. --- ChangeLog | 7 +++++++ configure.in | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9b9a7176b05..ade71ae09a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-10-24 Paul Eggert + + * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) + if the library is found. Otherwise, later configure-time tests, + such as the test for pthread_sigmask, generate the wrong results + on some platforms. Problem reported for FreeBSD by Nali Toja. + 2011-10-20 Paul Eggert Time zone name fixes for non-ASCII locales (Bug#641, Bug#9794) diff --git a/configure.in b/configure.in index 5b32e10853f..3040c13e683 100644 --- a/configure.in +++ b/configure.in @@ -1723,7 +1723,8 @@ fi if test "$HAVE_PTHREAD" = yes; then case "${canonical}" in *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" ;; + *) LIB_PTHREAD="-lpthread" + LIBS="$LIB_PTHREAD $LIBS" ;; esac AC_DEFINE(HAVE_PTHREAD, 1, [Define to 1 if you have pthread (-lpthread).]) fi From a3839de209ecd292b124b0818dbc60eaa654aa68 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 23 Oct 2011 22:56:59 -0400 Subject: [PATCH 04/21] * lisp/progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. * lisp/progmodes/octave-mod.el (octave-help): Remove. --- lisp/ChangeLog | 25 +++++++++++++++---------- lisp/progmodes/octave-inf.el | 2 +- lisp/progmodes/octave-mod.el | 8 -------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ceb3617176..acefb4f6f15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-24 Stefan Monnier + + * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. + * progmodes/octave-mod.el (octave-help): Remove. + 2011-10-23 Michael Albinus Sync with Tramp 2.2.3. @@ -16,16 +21,16 @@ for toggle-read-only. Note that this hasn't called vc-next-action since 2008-05-02, though it wasn't documented at the time. - * vc/ediff-init.el (ediff-toggle-read-only-function): Use - toggle-read-only. + * vc/ediff-init.el (ediff-toggle-read-only-function): + Use toggle-read-only. 2011-10-22 Alan Mackenzie Fix bug #9560, sporadic wrong indentation; improve instrumentation of c-parse-state. - * cc-engine.el (c-append-lower-brace-pair-to-state-cache): correct - faulty logical expression. + * cc-engine.el (c-append-lower-brace-pair-to-state-cache): + correct faulty logical expression. (c-parse-state-state, c-record-parse-state-state): (c-replay-parse-state-state): New defvar/defuns. (c-debug-parse-state): Use new functions. @@ -39,8 +44,8 @@ * progmodes/idlwave.el (idlwave-mode): * progmodes/vera-mode.el (vera-mode): No need to set - require-final-newline; that's done in prog-mode. Suggested by - Stefan Monnier. + require-final-newline; that's done in prog-mode. + Suggested by Stefan Monnier. 2011-10-21 Martin Rudalics @@ -61,8 +66,8 @@ 2011-10-21 Chong Yidong * progmodes/idlwave.el (idlwave-mode): - * progmodes/vera-mode.el (vera-mode): Use - mode-require-final-newline. + * progmodes/vera-mode.el (vera-mode): + Use mode-require-final-newline. 2011-10-20 Glenn Morris @@ -198,8 +203,8 @@ (global-whitespace-mode, global-whitespace-newline-mode): * xt-mouse.el (xterm-mouse-mode): Doc fix. - * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix - autogenerated docstring. + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): + Fix autogenerated docstring. 2011-10-19 Juri Linkov diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index cb64b2436c6..e9d890c3f26 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -68,7 +68,7 @@ mode, set this to (\"-q\" \"--traditional\")." (define-key map "\C-c\C-l" 'inferior-octave-dynamic-list-input-ring) (define-key map [menu-bar inout list-history] '("List Input History" . inferior-octave-dynamic-list-input-ring)) - (define-key map "\C-c\C-h" 'octave-help) + (define-key map "\C-c\C-h" 'info-lookup-symbol) map) "Keymap used in Inferior Octave mode.") diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 183347cdeca..5e13b8533e7 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -655,14 +655,6 @@ including a reproducible test case and send the message." (easy-menu-add octave-mode-menu) (octave-initialize-completions)) - -(defvar info-lookup-mode) - -(defun octave-help () - "Get help on Octave symbols from the Octave info files. -Look up symbol in the function, operator and variable indices of the info files." - (let ((info-lookup-mode 'octave-mode)) - (call-interactively 'info-lookup-symbol))) ;;; Miscellaneous useful functions From feecf43567ca35641042bbec8e4d67ba64577360 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 24 Oct 2011 08:47:05 +0300 Subject: [PATCH 05/21] * lisp/info.el (Info-following-node-name-re): Add newline to the list of allowed characters for leading space. Fixes: debbugs:9824 --- lisp/ChangeLog | 5 +++++ lisp/info.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index acefb4f6f15..264a4e8a7e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-24 Juri Linkov + + * info.el (Info-following-node-name-re): Add newline to the list + of allowed characters for leading space. (Bug#9824) + 2011-10-24 Stefan Monnier * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. diff --git a/lisp/info.el b/lisp/info.el index 4ccbeba2a47..b8deb3c9c7f 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -2015,7 +2015,7 @@ Submatch 1 is the complete node name. Submatch 2 if non-nil is the parenthesized file name part of the node name. Submatch 3 is the local part of the node name. End of submatch 0, 1, and 3 are the same, so you can safely concat." - (concat "[ \t]*" ;Skip leading space. + (concat "[ \t\n]*" ;Skip leading space. "\\(\\(([^)]+)\\)?" ;Node name can start with a file name. "\\([" (or allowedchars "^,\t\n") "]*" ;Any number of allowed chars. "[" (or allowedchars "^,\t\n") " ]" ;The last char can't be a space. From db2440b6ccf1a9c098d2c00ef4218a1542f8c8f8 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 24 Oct 2011 08:56:04 +0300 Subject: [PATCH 06/21] * lisp/isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to `search-whitespace-regexp' only when `isearch-regexp' is non-nil. Fixes: debbugs:9364 --- lisp/ChangeLog | 6 ++++++ lisp/isearch.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 264a4e8a7e8..b20ebccea89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-24 Juri Linkov + + * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to + `search-whitespace-regexp' only when `isearch-regexp' is non-nil. + (Bug#9364) + 2011-10-24 Juri Linkov * info.el (Info-following-node-name-re): Add newline to the list diff --git a/lisp/isearch.el b/lisp/isearch.el index 6cfcce59672..6bb23916da3 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1452,7 +1452,7 @@ string. NLINES has the same meaning as in `occur'." ;; Set `search-upper-case' to nil to not call ;; `isearch-no-upper-case-p' in `occur-1'. (search-upper-case nil) - (search-spaces-regexp search-whitespace-regexp)) + (search-spaces-regexp (if isearch-regexp search-whitespace-regexp))) (occur regexp nlines))) (declare-function hi-lock-read-face-name "hi-lock" ()) From 7f5c46c780cb5003aa1fa2c10b0141bef08ca916 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 24 Oct 2011 10:02:02 +0200 Subject: [PATCH 07/21] * notifications.el: Add the requirement of a running D-Bus session bus to the Commentary. --- lisp/ChangeLog | 5 +++++ lisp/notifications.el | 3 +++ 2 files changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b20ebccea89..03e0ba3ef89 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-24 Michael Albinus + + * notifications.el: Add the requirement of a running D-Bus session + bus to the Commentary. + 2011-10-24 Juri Linkov * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to diff --git a/lisp/notifications.el b/lisp/notifications.el index 42cd40df36b..a4e7fdd5425 100644 --- a/lisp/notifications.el +++ b/lisp/notifications.el @@ -30,6 +30,9 @@ ;; ;; (require 'notifications) +;; For proper usage, Emacs must be started in an environment with an +;; active D-Bus session bus. + ;;; Code: (eval-when-compile (require 'cl)) From fbecbfb92b83a508ef299343f7dd9313086a885a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 24 Oct 2011 06:18:38 -0400 Subject: [PATCH 08/21] Auto-commit of generated files. --- autogen/configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autogen/configure b/autogen/configure index fc906db6fea..fceca6c0bec 100755 --- a/autogen/configure +++ b/autogen/configure @@ -10380,7 +10380,8 @@ fi if test "$HAVE_PTHREAD" = yes; then case "${canonical}" in *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" ;; + *) LIB_PTHREAD="-lpthread" + LIBS="$LIB_PTHREAD $LIBS" ;; esac $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h From c1ebb47e3da1840bb438372f67335df1d30c4ffd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 24 Oct 2011 13:37:03 -0400 Subject: [PATCH 09/21] * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/easy-mmode.el | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 03e0ba3ef89..57b89b973f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-10-24 Glenn Morris + + * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) + 2011-10-24 Michael Albinus * notifications.el: Add the requirement of a running D-Bus session diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index b1cb0615e43..4b6f4d634ca 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -94,8 +94,9 @@ Optional LIGHTER is displayed in the modeline when the mode is on. Optional KEYMAP is the default keymap bound to the mode keymap. If non-nil, it should be a variable name (whose value is a keymap), or an expression that returns either a keymap or a list of - arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol, - this also defines the variable MODE-map. + arguments for `easy-mmode-define-keymap'. If you supply a KEYMAP + argument that is not a symbol, this macro defines the variable + MODE-map and gives it the value that KEYMAP specifies. BODY contains code to execute each time the mode is enabled or disabled. It is executed after toggling the mode, and before running MODE-hook. From 958ad48682256150c5cde455fe21752ab1ea3afb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 24 Oct 2011 21:29:19 +0200 Subject: [PATCH 10/21] lisp/facemenu.el: Slightly expand a comment in `list-colors-duplicates'. --- lisp/facemenu.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 54b17d58f33..4f9db02b5e1 100644 --- a/lisp/facemenu.el +++ b/lisp/facemenu.el @@ -645,6 +645,8 @@ a list of colors that the current display can handle." ;; text in menu entries) and `SystemWindowText' (the default ;; color w32 uses for the text in windows and dialogs) may ;; be the same display color and be adjacent in the list. + ;; These system colors all have names prefixed with "System", + ;; which is hardcoded in w32fns.c (SYSTEM_COLOR_PREFIX). ;; This makes them different to any other color. Bug#9722 (not (and (eq system-type 'windows-nt) (string-match-p "^System" (car (car l)))))) From 410488d3aeae877ff13c005a9c4141d1d7ec9c91 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 24 Oct 2011 22:19:17 -0400 Subject: [PATCH 11/21] * lisp/comint.el (comint-get-old-input-default): Fix use-prompt-regexp case. Fixes: debbugs:9865 --- lisp/ChangeLog | 5 +++++ lisp/comint.el | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57b89b973f1..32e46b2c172 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Stefan Monnier + + * comint.el (comint-get-old-input-default): Fix use-prompt-regexp case + (bug#9865). + 2011-10-24 Glenn Morris * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819) diff --git a/lisp/comint.el b/lisp/comint.el index 591be5e2d9d..dc3cdd9fa7a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2151,8 +2151,10 @@ current line, if point is on an output field. If `comint-use-prompt-regexp' is non-nil, then return the current line with any initial string matching the regexp `comint-prompt-regexp' removed." - (let ((bof (field-beginning))) - (if (null (get-char-property bof 'field)) ;Not `output'. + (let (bof) + (if (and comint-use-prompt-regexp + ;; Make sure we're in an input rather than output field. + (null (get-char-property (setq bof (field-beginning)) 'field))) (field-string-no-properties bof) (comint-bol) (buffer-substring-no-properties (point) (line-end-position))))) From df6d30f325a57fe0bc60025f391a41e27794c8f5 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Mon, 24 Oct 2011 20:33:24 -0600 Subject: [PATCH 12/21] * INSTALL: Update URL for GTK download page. --- nt/ChangeLog | 4 ++++ nt/INSTALL | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index fb3a168ebfe..83dcb0a029b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2011-10-25 Christoph Scholtes + + * INSTALL: Update URL for GTK download page. + 2011-10-19 Eli Zaretskii * config.nt (HAVE_TZNAME, HAVE_DECL_TZNAME): Define. diff --git a/nt/INSTALL b/nt/INSTALL index b4a97011922..613610890ae 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -323,7 +323,7 @@ For PNG images, we recommend to use versions 1.4.x and later of libpng, because previous versions had security issues. You can find precompiled libraries and headers on the GTK download page for - Windows (http://www.gtk.org/download-windows.html). + Windows (http://www.gtk.org/download/win32.php). Versions 1.4.0 and later of libpng are binary incompatible with earlier versions, so Emacs will only look for libpng libraries which From e112cc3727670af0514df84f372e4d640d52ed20 Mon Sep 17 00:00:00 2001 From: Enami Tsugutomo Date: Tue, 25 Oct 2011 12:27:47 +0800 Subject: [PATCH 13/21] * sysdep.c (init_sys_modes): Fix the check for the controlling terminal. Fixes: debbugs:6649 --- src/ChangeLog | 5 +++++ src/sysdep.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3f9b5beeab6..cee48bd1731 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Enami Tsugutomo + + * sysdep.c (init_sys_modes): Fix the check for the controlling + terminal (Bug#6649). + 2011-10-20 Eli Zaretskii * dispextern.h (struct bidi_it): New member next_en_type. diff --git a/src/sysdep.c b/src/sysdep.c index b0d5a1abbe3..d666f8dbb79 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -854,6 +854,7 @@ void init_sys_modes (struct tty_display_info *tty_out) { struct emacs_tty tty; + Lisp_Object terminal; Vtty_erase_char = Qnil; @@ -907,7 +908,9 @@ init_sys_modes (struct tty_display_info *tty_out) tty.main.c_cflag &= ~PARENB;/* Don't check parity */ } #endif - if (tty_out->input == stdin) + + XSETTERMINAL(terminal, tty_out->terminal); + if (!NILP (Fcontrolling_tty_p (terminal))) { tty.main.c_cc[VINTR] = quit_char; /* C-g (usually) gives SIGINT */ /* Set up C-g for both SIGQUIT and SIGINT. From d53e174785478e15164870f8118f522e709c7fc1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 25 Oct 2011 00:25:45 -0700 Subject: [PATCH 14/21] * abbrevs.texi (Saving Abbrevs): quietly-read-abbrev-file is not a command. Fixes: debbugs:9866 --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/abbrevs.texi | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a1310e87b15..4b51486069c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Glenn Morris + + * abbrevs.texi (Saving Abbrevs): + quietly-read-abbrev-file is not a command. (Bug#9866) + 2011-10-24 Chong Yidong * display.texi (Scrolling): Document scroll-up-line and diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index d0833ea0854..2eafadf4841 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -286,8 +286,6 @@ sessions. Write a file @var{file} describing all defined abbrevs. @item M-x read-abbrev-file @key{RET} @var{file} @key{RET} Read the file @var{file} and define abbrevs as specified therein. -@item M-x quietly-read-abbrev-file @key{RET} @var{file} @key{RET} -Similar but do not display a message about what is going on. @item M-x define-abbrevs Define abbrevs from definitions in current buffer. @item M-x insert-abbrevs From 81a0a2681d063e0282f91ac91883ca2a06c529db Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 25 Oct 2011 08:33:31 -0400 Subject: [PATCH 15/21] * comint.el (comint-get-old-input-default): Fix thinko in last change. Fixes: debbugs:9865 --- lisp/comint.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/comint.el b/lisp/comint.el index dc3cdd9fa7a..b91b82adb21 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2152,7 +2152,7 @@ If `comint-use-prompt-regexp' is non-nil, then return the current line with any initial string matching the regexp `comint-prompt-regexp' removed." (let (bof) - (if (and comint-use-prompt-regexp + (if (and (not comint-use-prompt-regexp) ;; Make sure we're in an input rather than output field. (null (get-char-property (setq bof (field-beginning)) 'field))) (field-string-no-properties bof) From 3f04efd64d76ea897cb3b27f971777c66042a23b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 25 Oct 2011 14:50:03 +0200 Subject: [PATCH 16/21] * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for filenames "/method:foo:". --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 17 +++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32e46b2c172..95113007f27 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-file-directory-p): Return t for + filenames "/method:foo:". + 2011-10-25 Stefan Monnier * comint.el (comint-get-old-input-default): Fix use-prompt-regexp case diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 56424f79476..55732194bc8 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1594,17 +1594,14 @@ and gid of the corresponding user is taken. Both parameters must be integers." (defun tramp-sh-handle-file-directory-p (filename) "Like `file-directory-p' for Tramp files." - ;; Care must be taken that this function returns `t' for symlinks - ;; pointing to directories. Surely the most obvious implementation - ;; would be `test -d', but that returns false for such symlinks. - ;; CCC: Stefan Monnier says that `test -d' follows symlinks. And - ;; I now think he's right. So we could be using `test -d', couldn't - ;; we? - ;; - ;; Alternatives: `cd %s', `test -d %s' (with-parsed-tramp-file-name filename nil - (with-file-property v localname "file-directory-p" - (tramp-run-test "-d" filename)))) + ;; `file-directory-p' is used as predicate for filename completion. + ;; Sometimes, when a connection is not established yet, it is + ;; desirable to return t immediately for "/method:foo:". It can + ;; be expected that this is always a directory. + (or (zerop (length localname)) + (with-file-property v localname "file-directory-p" + (tramp-run-test "-d" filename))))) (defun tramp-sh-handle-file-writable-p (filename) "Like `file-writable-p' for Tramp files." From e6346438e26069017f0eb5e1b15c53c30587462e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 25 Oct 2011 08:54:04 -0400 Subject: [PATCH 17/21] Make function-key-map apply when key is bound to `undefined'. * src/keyboard.c (test_undefined): New function. (read_key_sequence): Use it to detect when a key is bound to `undefined'. Fixes: debbugs:9751 --- src/ChangeLog | 5 +++++ src/keyboard.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cee48bd1731..52581be2863 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Stefan Monnier + + * keyboard.c (test_undefined): New function (bug#9751). + (read_key_sequence): Use it to detect when a key is bound to `undefined'. + 2011-10-25 Enami Tsugutomo * sysdep.c (init_sys_modes): Fix the check for the controlling diff --git a/src/keyboard.c b/src/keyboard.c index 6f3bfd8c1e7..eb316947dcb 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8902,6 +8902,14 @@ keyremap_step (Lisp_Object *keybuf, int bufsize, volatile keyremap *fkey, return 0; } +static int +test_undefined (Lisp_Object binding) +{ + return (EQ (binding, Qundefined) + || (!NILP (binding) && SYMBOLP (binding) + && EQ (Fcommand_remapping (binding, Qnil, Qnil), Qundefined))); +} + /* Read a sequence of keys that ends with a non prefix character, storing it in KEYBUF, a buffer of size BUFSIZE. Prompt with PROMPT. @@ -9852,7 +9860,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, } } - if (first_binding < nmaps && NILP (submaps[first_binding]) + if (first_binding < nmaps + && NILP (submaps[first_binding]) + && !test_undefined (defs[first_binding]) && indec.start >= t) /* There is a binding and it's not a prefix. (and it doesn't have any input-decode-map translation pending). @@ -9879,7 +9889,9 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, /* If there's a binding (i.e. first_binding >= nmaps) we don't want to apply this function-key-mapping. */ - fkey.end + 1 == t && first_binding >= nmaps, + fkey.end + 1 == t + && (first_binding >= nmaps + || test_undefined (defs[first_binding])), &diff, prompt); UNGCPRO; if (done) From fe0055fa74c94ba1d3bbdf36cffd3d28ffe95158 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 25 Oct 2011 09:36:20 -0700 Subject: [PATCH 18/21] * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2). --- src/ChangeLog | 4 ++++ src/dispextern.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 52581be2863..854c4987be5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-10-25 Paul Eggert + + * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2). + 2011-10-25 Stefan Monnier * keyboard.c (test_undefined): New function (bug#9751). diff --git a/src/dispextern.h b/src/dispextern.h index dd5f67d2d10..5c60a5499da 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3346,6 +3346,7 @@ extern int tty_capable_p (struct tty_display_info *, unsigned, unsigned long, un extern void set_tty_color_mode (struct tty_display_info *, struct frame *); extern struct terminal *get_named_tty (const char *); EXFUN (Ftty_type, 1); +EXFUN (Fcontrolling_tty_p, 1); extern void create_tty_output (struct frame *); extern struct terminal *init_tty (const char *, const char *, int); extern void tty_append_glyph (struct it *); From d2eaf3e40d0708a16fa48538173ef635ee6a17e0 Mon Sep 17 00:00:00 2001 From: Nali Toja Date: Tue, 25 Oct 2011 09:41:26 -0700 Subject: [PATCH 19/21] * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (tiny change) Fixes: debbugs:9868 --- ChangeLog | 4 ++++ configure.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ade71ae09a7..2cd3f8eef85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-10-25 Nali Toja (tiny change) + + * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var. (Bug#9868) + 2011-10-24 Paul Eggert * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) diff --git a/configure.in b/configure.in index 3040c13e683..ab5f74573f0 100644 --- a/configure.in +++ b/configure.in @@ -1374,7 +1374,7 @@ dnl check for GNU Make if we have GCC and autodepend is on. if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then AC_MSG_CHECKING([whether we are using GNU Make]) HAVE_GNU_MAKE=no - testval=`make --version 2>/dev/null | grep 'GNU Make'` + testval=`${MAKE-make} --version 2>/dev/null | grep 'GNU Make'` if test "x$testval" != x; then HAVE_GNU_MAKE=yes else From df1c5f0561cbc14b9ee85b034ba7ef67fd8edb3f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 25 Oct 2011 18:54:19 +0200 Subject: [PATCH 20/21] Don't put INSTALL into w32 binary distributions. (Bug#9861) nt/makefile.w32-in (dist): Don't put the top-level INSTALL into the distribution. --- nt/ChangeLog | 5 +++++ nt/makefile.w32-in | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 83dcb0a029b..08fd7677077 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2011-10-25 Eli Zaretskii + + * makefile.w32-in (dist): Don't put the top-level INSTALL into the + distribution. (Bug#9861) + 2011-10-25 Christoph Scholtes * INSTALL: Update URL for GTK download page. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 4e4e6eccbb7..07d9be2c117 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -263,7 +263,6 @@ dist: install-bin $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR) - $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR) $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR) $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR) $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR) From 507ea2587e3b868468e83ff6bc8b3303c4097984 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 25 Oct 2011 13:46:31 -0700 Subject: [PATCH 21/21] * configure.in: Respect MAKE env-var. (Bug#9868, part 2) --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index ab5f74573f0..ee52bc9e976 100644 --- a/configure.in +++ b/configure.in @@ -3740,14 +3740,14 @@ echo if test "$HAVE_NS" = "yes"; then echo - echo "You must run \"make install\" in order to test the built application. + echo "You must run \"${MAKE-make} install\" in order to test the built application. The installed application will go to nextstep/Emacs.app and can be run or moved from there." if test "$EN_NS_SELF_CONTAINED" = "yes"; then echo "The application will be fully self-contained." else echo "The lisp resources for the application will be installed under ${prefix}. -You may need to run \"make install\" with sudo. The application will fail +You may need to run \"${MAKE-make} install\" with sudo. The application will fail to run if these resources are not installed." fi echo