Now on revision 107029. ------------------------------------------------------------ revno: 107029 fixes bug(s): http://debbugs.gnu.org/10657 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-01-31 14:51:33 +0800 message: Minor tweaks to the Lisp manual. * syntax.texi (Parsing Expressions): Clarify intro. (Parser State): Remove unnecessary statement (Bug#10661). * eval.texi (Intro Eval): Add footnote about "sexp" terminology. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-01-31 05:03:09 +0000 +++ doc/lispref/ChangeLog 2012-01-31 06:51:33 +0000 @@ -1,3 +1,10 @@ +2012-01-31 Chong Yidong + + * syntax.texi (Parsing Expressions): Clarify intro (Bug#10657). + (Parser State): Remove unnecessary statement (Bug#10661). + + * eval.texi (Intro Eval): Add footnote about "sexp" terminology. + 2012-01-31 Glenn Morris * modes.texi (Defining Minor Modes): === modified file 'doc/lispref/eval.texi' --- doc/lispref/eval.texi 2012-01-23 04:23:50 +0000 +++ doc/lispref/eval.texi 2012-01-31 06:51:33 +0000 @@ -39,12 +39,15 @@ @cindex form @cindex expression - A Lisp object that is intended for evaluation is called an -@dfn{expression} or a @dfn{form}. The fact that forms are data -objects and not merely text is one of the fundamental differences -between Lisp-like languages and typical programming languages. Any -object can be evaluated, but in practice only numbers, symbols, lists -and strings are evaluated very often. +@cindex S-expression + A Lisp object that is intended for evaluation is called a @dfn{form} +or @dfn{expression}@footnote{It is sometimes also referred to as an +@dfn{S-expression} or @dfn{sexp}, but we generally do not use this +terminology in this manual.}. The fact that forms are data objects +and not merely text is one of the fundamental differences between +Lisp-like languages and typical programming languages. Any object can +be evaluated, but in practice only numbers, symbols, lists and strings +are evaluated very often. In subsequent sections, we will describe the details of what evaluation means for each kind of form. @@ -96,12 +99,12 @@ @node Forms @section Kinds of Forms - A Lisp object that is intended to be evaluated is called a @dfn{form}. -How Emacs evaluates a form depends on its data type. Emacs has three -different kinds of form that are evaluated differently: symbols, lists, -and ``all other types.'' This section describes all three kinds, one by -one, starting with the ``all other types'' which are self-evaluating -forms. + A Lisp object that is intended to be evaluated is called a +@dfn{form} (or an @dfn{expression}). How Emacs evaluates a form +depends on its data type. Emacs has three different kinds of form +that are evaluated differently: symbols, lists, and ``all other +types.'' This section describes all three kinds, one by one, starting +with the ``all other types'' which are self-evaluating forms. @menu * Self-Evaluating Forms:: Forms that evaluate to themselves. === modified file 'doc/lispref/syntax.texi' --- doc/lispref/syntax.texi 2012-01-29 07:35:58 +0000 +++ doc/lispref/syntax.texi 2012-01-31 06:51:33 +0000 @@ -606,11 +606,13 @@ @section Parsing Expressions This section describes functions for parsing and scanning balanced -expressions, also known as @dfn{sexps}. Basically, a sexp is either a -balanced parenthetical grouping, a string, or a symbol name (a -sequence of characters whose syntax is either word constituent or -symbol constituent). However, characters whose syntax is expression -prefix are treated as part of the sexp if they appear next to it. +expressions. We will refer to such expressions as @dfn{sexps}, +following the terminology of Lisp, even though these functions can act +on languages other than Lisp. Basically, a sexp is either a balanced +parenthetical grouping, a string, or a ``symbol'' (i.e.@: a sequence +of characters whose syntax is either word constituent or symbol +constituent). However, characters whose syntax is expression prefix +are treated as part of the sexp if they appear next to it. The syntax table controls the interpretation of characters, so these functions can be used for Lisp expressions when in Lisp mode and for C @@ -830,10 +832,6 @@ arrived at a top level position. @end defun - We have provided this access function rather than document how the -data is represented in the state, because we plan to change the -representation in the future. - @node Low-Level Parsing @subsection Low-Level Parsing ------------------------------------------------------------ revno: 107028 fixes bug(s): http://debbugs.gnu.org/10666 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-01-31 14:32:14 +0800 message: * windows.texi (Split Window): C-mouse-2 doesn't work on GTK+ scroll bars. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-01-28 04:12:47 +0000 +++ doc/emacs/ChangeLog 2012-01-31 06:32:14 +0000 @@ -1,3 +1,8 @@ +2012-01-31 Chong Yidong + + * windows.texi (Split Window): C-mouse-2 doesn't work on GTK+ + scroll bars (Bug#10666). + 2012-01-28 Chong Yidong * files.texi (Filesets): Fix typos. === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/frames.texi 2012-01-31 06:32:14 +0000 @@ -370,7 +370,6 @@ position (@pxref{Split Window}). @end table -@kindex C-Mouse-2 @r{(scroll bar)} @kindex Mouse-1 @r{(scroll bar)} Furthermore, by clicking and dragging @kbd{Mouse-1} on the divider between two side-by-side mode lines, you can move the vertical === modified file 'doc/emacs/windows.texi' --- doc/emacs/windows.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/windows.texi 2012-01-31 06:32:14 +0000 @@ -72,7 +72,7 @@ Split the selected window into two windows, positioned side by side (@code{split-window-right}). @item C-Mouse-2 -In the mode line or scroll bar of a window, split that window. +In the mode line of a window, split that window. @end table @kindex C-x 2 @@ -125,11 +125,14 @@ On text terminals, side-by-side windows are separated by a vertical divider which is drawn using the @code{vertical-border} face. +@kindex C-Mouse-2 @r{(mode line)} @kindex C-Mouse-2 @r{(scroll bar)} - You can also split a window horizontally or vertically by clicking -@kbd{C-Mouse-2} in the mode line or the scroll bar. If you click on -the mode line, that puts the vertical divider where you click; if you -click in the scroll bar, that puts the new mode-line where you click. + If you click @kbd{C-Mouse-2} in the mode line of a window, that +splits the window, putting a vertical divider where you click. +Depending on how Emacs is compiled, you can also split a window by +clicking @kbd{C-Mouse-2} in the scroll bar, which puts a horizontal +divider where you click (this feature does not work when Emacs uses +GTK+ scroll bars). @node Other Window @section Using Other Windows ------------------------------------------------------------ revno: 107027 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 21:03:09 -0800 message: Document define-minor-mode's new :variable keyword in the lispref. * doc/lispref/modes.texi (Defining Minor Modes): Document define-minor-mode's new :variable keyword. * etc/NEWS: Markup. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-01-29 07:35:58 +0000 +++ doc/lispref/ChangeLog 2012-01-31 05:03:09 +0000 @@ -1,3 +1,8 @@ +2012-01-31 Glenn Morris + + * modes.texi (Defining Minor Modes): + Document define-minor-mode's new :variable keyword. + 2012-01-29 Chong Yidong * syntax.texi (Syntax Class Table): Tweak description of newline === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2012-01-28 03:49:22 +0000 +++ doc/lispref/modes.texi 2012-01-31 05:03:09 +0000 @@ -1351,11 +1351,11 @@ @defmac define-minor-mode mode doc [init-value [lighter [keymap]]] keyword-args@dots{} body@dots{} This macro defines a new minor mode whose name is @var{mode} (a symbol). It defines a command named @var{mode} to toggle the minor -mode, with @var{doc} as its documentation string. It also defines a -variable named @var{mode}, which is set to @code{t} or @code{nil} by -enabling or disabling the mode. The variable is initialized to -@var{init-value}. Except in unusual circumstances (see below), this -value must be @code{nil}. +mode, with @var{doc} as its documentation string. By default, it also +defines a variable named @var{mode}, which is set to @code{t} or +@code{nil} by enabling or disabling the mode. The variable is +initialized to @var{init-value}. Except in unusual circumstances (see +below), this value must be @code{nil}. The string @var{lighter} says what to display in the mode line when the mode is enabled; if it is @code{nil}, the mode is not displayed @@ -1410,6 +1410,17 @@ @item :keymap @var{keymap} This is equivalent to specifying @var{keymap} positionally. + +@item :variable @var{place} +This replaces the default variable @var{mode}, used to store the state +of the mode. If you specify this, the @var{mode} variable is not +defined, and any @var{init-value} argument is unused. @var{place} +can be a different named variable (which you must define yourself), or +anything that can be used with the @code{setf} function +(@pxref{Generalized Variables,,, cl, Common Lisp Extensions}). +@var{place} can also be a cons @code{(@var{get} . @var{set})}, +where @var{get} is an expression that returns the current state, +and @var{set} is a function of one argument (a state) that sets it. @end table Any other keyword arguments are passed directly to the === modified file 'etc/NEWS' --- etc/NEWS 2012-01-31 01:01:30 +0000 +++ etc/NEWS 2012-01-31 05:03:09 +0000 @@ -1293,6 +1293,7 @@ *** Enabled globalized minor modes can be disabled in specific modes, by running (FOO-mode-hook 0) via a mode hook. ++++ *** `define-minor-mode' accepts a new keyword :variable. +++ ------------------------------------------------------------ revno: 107026 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 20:52:29 -0800 message: * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. diff: === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2012-01-31 04:50:04 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2012-01-31 04:52:29 +0000 @@ -114,6 +114,7 @@ buffer-local, so don't make the variable MODE buffer-local. By default, the mode is buffer-local. :init-value VAL Same as the INIT-VALUE argument. + Not used if you also specify :variable. :lighter SPEC Same as the LIGHTER argument. :keymap MAP Same as the KEYMAP argument. :require SYM Same as in `defcustom'. ------------------------------------------------------------ revno: 107025 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 20:50:04 -0800 message: * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-31 04:35:57 +0000 +++ lisp/ChangeLog 2012-01-31 04:50:04 +0000 @@ -9,9 +9,9 @@ 2012-01-31 Glenn Morris - * emacs-lisp/easy-mmode.el (define-minor-mode): + * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. Fix :variable handling of mode a symbol not equal to modefun. - Allow named functions to be used as the cdr of variable:. + Allow named functions to be used as the cdr of :variable. 2012-01-30 Glenn Morris === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2012-01-31 04:35:57 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2012-01-31 04:50:04 +0000 @@ -86,7 +86,8 @@ ;;;###autoload (defmacro define-minor-mode (mode doc &optional init-value lighter keymap &rest body) "Define a new minor mode MODE. -This defines the control variable MODE and the toggle command MODE. +This defines the toggle command MODE and (by default) a control variable +MODE (you can override this with the :variable keyword, see below). DOC is the documentation for the mode toggle command. Optional INIT-VALUE is the initial value of the mode's variable. @@ -116,12 +117,15 @@ :lighter SPEC Same as the LIGHTER argument. :keymap MAP Same as the KEYMAP argument. :require SYM Same as in `defcustom'. -:variable PLACE The location (as can be used with `setf') to use instead - of the variable MODE to store the state of the mode. PLACE - can also be of the form (GET . SET) where GET is an expression - that returns the current state and SET is a function that takes - a new state and sets it. If you specify a :variable, this - function assumes it is defined elsewhere. +:variable PLACE The location to use instead of the variable MODE to store + the state of the mode. This can be simply a different + named variable, or more generally anything that can be used + with the CL macro `setf'. PLACE can also be of the form + \(GET . SET), where GET is an expression that returns the + current state, and SET is a function that takes one argument, + the new state, and sets it. If you specify a :variable, + this function does not define a MODE variable (nor any of + the terms used in :variable). For example, you could write (define-minor-mode foo-mode \"If enabled, foo on you!\" ------------------------------------------------------------ revno: 107024 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 20:35:57 -0800 message: Small define-minor-mode fix for variable: keyword. * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Allow named functions to be used as the cdr of variable:. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-31 02:57:00 +0000 +++ lisp/ChangeLog 2012-01-31 04:35:57 +0000 @@ -9,7 +9,9 @@ 2012-01-31 Glenn Morris - * emacs-lisp/easy-mmode.el (define-minor-mode): Fix :variable case. + * emacs-lisp/easy-mmode.el (define-minor-mode): + Fix :variable handling of mode a symbol not equal to modefun. + Allow named functions to be used as the cdr of variable:. 2012-01-30 Glenn Morris === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2012-01-31 01:53:20 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2012-01-31 04:35:57 +0000 @@ -160,7 +160,7 @@ (hook (intern (concat mode-name "-hook"))) (hook-on (intern (concat mode-name "-on-hook"))) (hook-off (intern (concat mode-name "-off-hook"))) - keyw keymap-sym) + keyw keymap-sym tmp) ;; Check keys. (while (keywordp (setq keyw (car body))) @@ -177,7 +177,15 @@ (:require (setq require (pop body))) (:keymap (setq keymap (pop body))) (:variable (setq variable (pop body)) - (if (not (functionp (cdr-safe variable))) + (setq tmp (cdr-safe variable)) + (if (not (or (functionp tmp) + (and tmp + (symbolp tmp) + ;; Hack to allow for named functions not within + ;; eval-when-compile. + ;; Cf define-compilation-mode. + (boundp 'byte-compile-function-environment) + (assq tmp byte-compile-function-environment)))) ;; PLACE is not of the form (GET . SET). (setq mode variable) (setq mode (car variable)) ------------------------------------------------------------ revno: 107023 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 19:47:51 -0800 message: Small configure.in fix for Motif toolkit. * configure.in: Throw an explicit error if Motif toolkit was requested but requirements could not be found. diff: === modified file 'ChangeLog' --- ChangeLog 2012-01-31 02:43:59 +0000 +++ ChangeLog 2012-01-31 03:47:51 +0000 @@ -1,5 +1,8 @@ 2012-01-31 Glenn Morris + * configure.in: Throw an explicit error if Motif toolkit was + requested but requirements could not be found. + * configure.in: Allow Emacs to actually be built with xaw scroll-bars. 2012-01-30 Eli Zaretskii === modified file 'configure.in' --- configure.in 2012-01-31 02:43:59 +0000 +++ configure.in 2012-01-31 03:47:51 +0000 @@ -2234,6 +2234,8 @@ CPPFLAGS=$OLD_CPPFLAGS fi fi + AC_CHECK_HEADER([Xm/BulletinB.h], [], + [AC_MSG_ERROR([Motif toolkit requested but requirements not found.])]) fi dnl Use toolkit scroll bars if configured for GTK or X toolkit and either ------------------------------------------------------------ revno: 107022 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 19:33:16 -0800 message: * w32term.c: Copy previous xterm.c doc fix. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-01-31 03:07:38 +0000 +++ src/ChangeLog 2012-01-31 03:33:16 +0000 @@ -1,6 +1,7 @@ 2012-01-31 Glenn Morris * nsterm.m (syms_of_nsterm) : + * w32term.c (syms_of_w32term) : * xterm.c (syms_of_xterm) : Sync docs. 2012-01-29 Glenn Morris === modified file 'src/w32term.c' --- src/w32term.c 2012-01-19 07:21:25 +0000 +++ src/w32term.c 2012-01-31 03:33:16 +0000 @@ -6432,7 +6432,8 @@ A value of nil means Emacs doesn't use toolkit scroll bars. With the X Window system, the value is a symbol describing the X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. -With MS Windows, the value is t. */); +With MS Windows, the value is t. With Nextstep, the value is +t or nil. */); Vx_toolkit_scroll_bars = Qt; staticpro (&last_mouse_motion_frame); ------------------------------------------------------------ revno: 107021 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 19:07:38 -0800 message: x-toolkit-scroll-bars doc fix. * src/nsterm.m (syms_of_nsterm) : * src/xterm.c (syms_of_xterm) : Sync docs. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-01-29 03:08:15 +0000 +++ src/ChangeLog 2012-01-31 03:07:38 +0000 @@ -1,3 +1,8 @@ +2012-01-31 Glenn Morris + + * nsterm.m (syms_of_nsterm) : + * xterm.c (syms_of_xterm) : Sync docs. + 2012-01-29 Glenn Morris * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS). === modified file 'src/nsterm.m' --- src/nsterm.m 2012-01-19 07:21:25 +0000 +++ src/nsterm.m 2012-01-31 03:07:38 +0000 @@ -6735,7 +6735,12 @@ /* TODO: move to common code */ DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, - doc: /* If not nil, Emacs uses toolkit scroll bars. */); + doc: /* Which toolkit scroll bars Emacs uses, if any. +A value of nil means Emacs doesn't use toolkit scroll bars. +With the X Window system, the value is a symbol describing the +X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. +With MS Windows, the value is t. With Nextstep, the value is +t or nil. */); #ifdef USE_TOOLKIT_SCROLL_BARS Vx_toolkit_scroll_bars = Qt; #else === modified file 'src/xterm.c' --- src/xterm.c 2012-01-19 07:21:25 +0000 +++ src/xterm.c 2012-01-31 03:07:38 +0000 @@ -10844,7 +10844,8 @@ A value of nil means Emacs doesn't use toolkit scroll bars. With the X Window system, the value is a symbol describing the X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. -With MS Windows, the value is t. */); +With MS Windows, the value is t. With Nextstep, the value is +t or nil. */); #ifdef USE_TOOLKIT_SCROLL_BARS #ifdef USE_MOTIF Vx_toolkit_scroll_bars = intern_c_string ("motif"); ------------------------------------------------------------ revno: 107020 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2012-01-31 03:57:00 +0100 message: lisp/progmodes/cwarn.el: Small fixes. (cwarn): Remove dead link. (cwarn-configuration, cwarn-verbose, cwarn-mode-text, cwarn-load-hook): Remove * from defcustom docstrings. (turn-on-cwarn-mode): Make obsolete. (c-at-toplevel-p): Remove compatibility code for Emacs 20.3 and older. (turn-on-cwarn-mode-if-enabled): Call `cwarn-mode'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-31 01:53:20 +0000 +++ lisp/ChangeLog 2012-01-31 02:57:00 +0000 @@ -1,3 +1,12 @@ +2012-01-31 Juanma Barranquero + + * progmodes/cwarn.el (cwarn): Remove dead link. + (cwarn-configuration, cwarn-verbose, cwarn-mode-text, cwarn-load-hook): + Remove * from defcustom docstrings. + (turn-on-cwarn-mode): Make obsolete. + (c-at-toplevel-p): Remove compatibility code for Emacs 20.3 and older. + (turn-on-cwarn-mode-if-enabled): Call `cwarn-mode'. + 2012-01-31 Glenn Morris * emacs-lisp/easy-mmode.el (define-minor-mode): Fix :variable case. === modified file 'lisp/progmodes/cwarn.el' --- lisp/progmodes/cwarn.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/cwarn.el 2012-01-31 02:57:00 +0000 @@ -117,7 +117,6 @@ (defgroup cwarn nil "Highlight suspicious C and C++ constructions." :version "21.1" - :link '(url-link "http://www.andersl.com/emacs") :group 'faces) (defvar cwarn-mode nil @@ -129,7 +128,7 @@ (defcustom cwarn-configuration '((c-mode (not reference)) (c++-mode t)) - "*List of items each describing which features are enable for a mode. + "List of items each describing which features are enable for a mode. Each item is on the form (mode featurelist), where featurelist can be on one of three forms: @@ -158,7 +157,7 @@ :group 'cwarn) (defcustom cwarn-verbose t - "*When nil, CWarn mode will not generate any messages. + "When nil, CWarn mode will not generate any messages. Currently, messages are generated when the mode is activated and deactivated." @@ -166,7 +165,7 @@ :type 'boolean) (defcustom cwarn-mode-text " CWarn" - "*String to display in the mode line when CWarn mode is active. + "String to display in the mode line when CWarn mode is active. \(When the string is not empty, make sure that it has a leading space.)" :tag "CWarn mode text" ; To separate it from `global-...' @@ -174,7 +173,7 @@ :type 'string) (defcustom cwarn-load-hook nil - "*Functions to run when CWarn mode is first loaded." + "Functions to run when CWarn mode is first loaded." :tag "Load Hook" :group 'cwarn :type 'hook) @@ -204,6 +203,7 @@ This function is designed to be added to hooks, for example: (add-hook 'c-mode-hook 'turn-on-cwarn-mode)" (cwarn-mode 1)) +(make-obsolete 'turn-on-cwarn-mode 'cwarn-mode "24.1") ;;}}} ;;{{{ Help functions @@ -247,29 +247,6 @@ nil keywords))))) ;;}}} -;;{{{ Backward compatibility - -;; This piece of code will be part of CC mode as of Emacs 20.4. -(if (not (fboundp 'c-at-toplevel-p)) -(defun c-at-toplevel-p () - "Return a determination as to whether point is at the `top-level'. -Being at the top-level means that point is either outside any -enclosing block (such function definition), or inside a class -definition, but outside any method blocks. - -If point is not at the top-level (e.g. it is inside a method -definition), then nil is returned. Otherwise, if point is at a -top-level not enclosed within a class definition, t is returned. -Otherwise, a 2-vector is returned where the zeroth element is the -buffer position of the start of the class declaration, and the first -element is the buffer position of the enclosing class' opening -brace." - (let ((state (c-parse-state))) - (or (not (c-most-enclosing-brace state)) - (c-search-uplist-for-classkey state)))) -) - -;;}}} ;;{{{ Font-lock keywords and match functions ;; This section contains font-lock keywords. A font lock keyword can @@ -368,7 +345,7 @@ "Turn on CWarn mode in the current buffer if applicable. The mode is turned if some feature is enabled for the current `major-mode' in `cwarn-configuration'." - (if (cwarn-is-enabled major-mode) (turn-on-cwarn-mode))) + (when (cwarn-is-enabled major-mode) (cwarn-mode 1))) ;;;###autoload (define-globalized-minor-mode global-cwarn-mode ------------------------------------------------------------ revno: 107019 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 18:43:59 -0800 message: * configure.in: Allow Emacs to actually be built with xaw scroll-bars. diff: === modified file 'ChangeLog' --- ChangeLog 2012-01-30 18:33:36 +0000 +++ ChangeLog 2012-01-31 02:43:59 +0000 @@ -1,3 +1,7 @@ +2012-01-31 Glenn Morris + + * configure.in: Allow Emacs to actually be built with xaw scroll-bars. + 2012-01-30 Eli Zaretskii * lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O) === modified file 'configure.in' --- configure.in 2012-01-29 15:46:05 +0000 +++ configure.in 2012-01-31 02:43:59 +0000 @@ -2249,7 +2249,7 @@ AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) HAVE_XAW3D=no USE_TOOLKIT_SCROLL_BARS=yes - elif test "${HAVE_XAW3D}" = "yes"; then + elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then AC_DEFINE(USE_TOOLKIT_SCROLL_BARS) USE_TOOLKIT_SCROLL_BARS=yes fi ------------------------------------------------------------ revno: 107018 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 17:53:20 -0800 message: * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Fix :variable case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-30 08:24:14 +0000 +++ lisp/ChangeLog 2012-01-31 01:53:20 +0000 @@ -1,3 +1,7 @@ +2012-01-31 Glenn Morris + + * emacs-lisp/easy-mmode.el (define-minor-mode): Fix :variable case. + 2012-01-30 Glenn Morris * emacs-lisp/authors.el (authors-fixed-entries): === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2012-01-31 01:53:20 +0000 @@ -286,7 +286,7 @@ ,(if keymap keymap-sym `(if (boundp ',keymap-sym) ,keymap-sym)) nil - ,(unless (eq mode modefun) 'modefun))))))) + ,(unless (eq mode modefun) `',modefun))))))) ;;; ;;; make global minor mode ------------------------------------------------------------ revno: 107017 committer: Paul Eggert branch nick: trunk timestamp: Mon 2012-01-30 17:15:56 -0800 message: Spelling fix. diff: === modified file 'doc/lispref/numbers.texi' --- doc/lispref/numbers.texi 2012-01-29 07:25:22 +0000 +++ doc/lispref/numbers.texi 2012-01-31 01:15:56 +0000 @@ -284,7 +284,7 @@ @defun natnump object @cindex natural numbers -This predicate (whose name comes from the phrase ``natual number'') +This predicate (whose name comes from the phrase ``natural number'') tests to see whether its argument is a nonnegative integer, and returns @code{t} if so, @code{nil} otherwise. 0 is considered non-negative. ------------------------------------------------------------ revno: 107016 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 17:01:30 -0800 message: * etc/NEWS: view-buffer markup, again. Let's not document this now - let's fix it properly after 24.1 and document the correct behaviour. (bug#10650#12) diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-01-30 20:11:02 +0000 +++ etc/NEWS 2012-01-31 01:01:30 +0000 @@ -999,6 +999,7 @@ ** A backquote not followed by a space is now always treated as new-style. +--- ** view-buffer now treats special mode-class in the same way that view-file has since Emacs 22 (ie, it won't enable View mode if the major-mode is special). ------------------------------------------------------------ revno: 107015 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2012-01-30 23:30:22 +0000 message: Merge changes made in Gnus trunk gnus.texi (Agent Basics): Fix outdated description of `gnus-agent-auto-agentize-methods'. rfc2047.el (rfc2047-encode-region): Allow not folding the encoded words. (rfc2047-encode-string): Ditto. (rfc2047-encode-parameter): Don't fold parameters. Some MUAs do not understand folded filename="..." parameters, for instance. gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent section in the manual. diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/gnus.texi 2012-01-30 23:30:22 +0000 @@ -18236,8 +18236,7 @@ @kbd{J a} on the server (or servers) that you wish to have covered by the Agent (@pxref{Server Agent Commands}), or @kbd{J r} on automatically added servers you do not wish to have covered by the Agent. By default, -all @code{nntp} and @code{nnimap} servers in @code{gnus-select-method} and -@code{gnus-secondary-select-methods} are agentized. +no servers are agentized. @item Decide on download policy. It's fairly simple once you decide whether @@ -19263,7 +19262,7 @@ as running @kbd{J a} on the servers (@pxref{Server Agent Commands}). If the file exist, you must manage the servers manually by adding or removing them, this variable is only applicable the first time you -start Gnus. The default is @samp{(nntp nnimap)}. +start Gnus. The default is @samp{nil}. @end table === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-01-30 22:03:11 +0000 +++ lisp/gnus/ChangeLog 2012-01-30 23:30:22 +0000 @@ -1,5 +1,16 @@ +2012-01-30 Philipp Haselwarter (tiny change) + + * gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent + section in the manual. + 2012-01-30 Lars Ingebrigtsen + * rfc2047.el (rfc2047-encode-region): Allow not folding the encoded + words. + (rfc2047-encode-string): Ditto. + (rfc2047-encode-parameter): Don't fold parameters. Some MUAs do not + understand folded filename="..." parameters, for instance. + * nnimap.el (nnimap-wait-for-response): Include the imap server name in the message for greater debuggability. === modified file 'lisp/gnus/gnus-agent.el' --- lisp/gnus/gnus-agent.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-agent.el 2012-01-30 23:30:22 +0000 @@ -186,7 +186,7 @@ (defcustom gnus-agent-auto-agentize-methods nil "Initially, all servers from these methods are agentized. The user may remove or add servers using the Server buffer. -See Info node `(gnus)Server Buffer'." +See Info nodes `(gnus)Server Buffer', `(gnus)Agent Variables'." :version "22.1" :type '(repeat symbol) :group 'gnus-agent) === modified file 'lisp/gnus/rfc2047.el' --- lisp/gnus/rfc2047.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/rfc2047.el 2012-01-30 23:30:22 +0000 @@ -362,7 +362,7 @@ (modify-syntax-entry ?@ "." table) table)) -(defun rfc2047-encode-region (b e) +(defun rfc2047-encode-region (b e &optional dont-fold) "Encode words in region B to E that need encoding. By default, the region is treated as containing RFC2822 addresses. Dynamically bind `rfc2047-encoding-type' to change that." @@ -546,16 +546,17 @@ (signal (car err) (cdr err)) (error "Invalid data for rfc2047 encoding: %s" (mm-replace-in-string orig-text "[ \t\n]+" " ")))))))) - (rfc2047-fold-region b (point)) + (unless dont-fold + (rfc2047-fold-region b (point))) (goto-char (point-max)))) -(defun rfc2047-encode-string (string) +(defun rfc2047-encode-string (string &optional dont-fold) "Encode words in STRING. By default, the string is treated as containing addresses (see `rfc2047-encoding-type')." (mm-with-multibyte-buffer (insert string) - (rfc2047-encode-region (point-min) (point-max)) + (rfc2047-encode-region (point-min) (point-max) dont-fold) (buffer-string))) ;; From RFC 2047: @@ -850,7 +851,7 @@ is the standard but many mailers don't support it." (let ((rfc2047-encoding-type 'mime) (rfc2047-encode-max-chars nil)) - (rfc2045-encode-string param (rfc2047-encode-string value)))) + (rfc2045-encode-string param (rfc2047-encode-string value t)))) ;;; ;;; Functions for decoding RFC2047 messages ------------------------------------------------------------ revno: 107014 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2012-01-30 22:03:11 +0000 message: nnimap.el (nnimap-wait-for-response): Include the imap server name in the message for greater debuggability. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-01-29 00:28:05 +0000 +++ lisp/gnus/ChangeLog 2012-01-30 22:03:11 +0000 @@ -1,3 +1,8 @@ +2012-01-30 Lars Ingebrigtsen + + * nnimap.el (nnimap-wait-for-response): Include the imap server name in + the message for greater debuggability. + 2012-01-28 Lars Ingebrigtsen * mm-view.el (mm-display-inline-fontify): Bind `font-lock-support-mode' === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2012-01-27 14:32:25 +0000 +++ lisp/gnus/nnimap.el 2012-01-30 22:03:11 +0000 @@ -1738,7 +1738,8 @@ (not (looking-at (format "%d .*\n" sequence))))) (when messagep (nnheader-message-maybe - 7 "nnimap read %dk" (/ (buffer-size) 1000))) + 7 "nnimap read %dk from %s" (/ (buffer-size) 1000) + nnimap-address)) (nnheader-accept-process-output process) (goto-char (point-max))) openp) ------------------------------------------------------------ revno: 107013 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 12:11:02 -0800 message: * etc/NEWS: Markup. I no longer know whether the view-buffer changes need a manual update or not. See bug#10650. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-01-30 09:15:54 +0000 +++ etc/NEWS 2012-01-30 20:11:02 +0000 @@ -999,7 +999,6 @@ ** A backquote not followed by a space is now always treated as new-style. ---- ** view-buffer now treats special mode-class in the same way that view-file has since Emacs 22 (ie, it won't enable View mode if the major-mode is special). ------------------------------------------------------------ revno: 107012 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-01-30 20:37:01 +0200 message: nt/INSTALL: Update instructions for parallel builds. diff: === modified file 'nt/INSTALL' --- nt/INSTALL 2012-01-26 21:37:32 +0000 +++ nt/INSTALL 2012-01-30 18:37:01 +0000 @@ -68,13 +68,19 @@ With GNU Make, you can use the -j command-line option to have Make execute several commands at once, like this: + gmake -j 2 + + (With versions of GNU Make before 3.82, you need also set the + XMFLAGS variable, like this: + gmake -j 2 XMFLAGS="-j 2" - The XMFLAGS variable overrides the default behavior of GNU Make - on Windows, whereby recursive Make invocations reset the maximum - number of simultaneous commands to 1. The above command allows - up to 4 simultaneous commands at once in the top-level Make, and - up to 3 in each one of the recursive Make's. + The XMFLAGS variable overrides the default behavior of version + 3.82 and older of GNU Make on Windows, whereby recursive Make + invocations reset the maximum number of simultaneous commands to + 1. The above command allows up to 4 simultaneous commands at + once in the top-level Make, and up to 3 in each one of the + recursive Make's.) 4. Generate the Info manuals (only if you are building out of Bazaar, and if you have makeinfo.exe installed): ------------------------------------------------------------ revno: 107011 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-01-30 20:33:36 +0200 message: lib/makefile.w32-in: Fix dependencies for a parallel build. lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O)): Depend on stamp_BLD. Fixes a build failure with "make -j3". diff: === modified file 'ChangeLog' --- ChangeLog 2012-01-19 07:21:25 +0000 +++ ChangeLog 2012-01-30 18:33:36 +0000 @@ -1,3 +1,9 @@ +2012-01-30 Eli Zaretskii + + * lib/makefile.w32-in ($(BLD)/sha1.$(O) $(BLD)/sha256.$(O) + $(BLD)/sha512.$(O)): Depend on stamp_BLD. Fixes a build failure + with "make -j3". + 2012-01-16 Juanma Barranquero * .bzrignore: Ignore etc/__pycache__. === modified file 'lib/makefile.w32-in' --- lib/makefile.w32-in 2011-11-05 11:34:56 +0000 +++ lib/makefile.w32-in 2012-01-30 18:33:36 +0000 @@ -155,6 +155,7 @@ # $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD +$(BLD)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O): stamp_BLD $(BLD)/filemode.$(O): stamp_BLD # ------------------------------------------------------------ revno: 107010 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 06:17:52 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-01-19 07:21:25 +0000 +++ autogen/configure 2012-01-30 11:17:52 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for emacs 24.0.92. +# Generated by GNU Autoconf 2.65 for emacs 24.0.93. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='24.0.92' -PACKAGE_STRING='emacs 24.0.92' +PACKAGE_VERSION='24.0.93' +PACKAGE_STRING='emacs 24.0.93' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1885,7 +1885,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 24.0.92 to adapt to many kinds of systems. +\`configure' configures emacs 24.0.93 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1959,7 +1959,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 24.0.92:";; + short | recursive ) echo "Configuration of emacs 24.0.93:";; esac cat <<\_ACEOF @@ -2122,7 +2122,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 24.0.92 +emacs configure 24.0.93 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2844,7 +2844,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 24.0.92, which was +It was created by emacs $as_me 24.0.93, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3677,7 +3677,7 @@ # Define the identity of the package. PACKAGE='emacs' - VERSION='24.0.92' + VERSION='24.0.93' cat >>confdefs.h <<_ACEOF @@ -23116,7 +23116,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 24.0.92, which was +This file was extended by emacs $as_me 24.0.93, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23182,7 +23182,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -emacs config.status 24.0.92 +emacs config.status 24.0.93 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" ------------------------------------------------------------ revno: 107009 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 01:15:54 -0800 message: * etc/NEWS: Reword view-buffer entry. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-01-30 09:06:54 +0000 +++ etc/NEWS 2012-01-30 09:15:54 +0000 @@ -1000,11 +1000,9 @@ ** A backquote not followed by a space is now always treated as new-style. --- -** View mode's test for a special mode-class is now in view-buffer. -So now this command respects special modes too - previously only -view-file did. Note that commands such as view-file-other-frame still -do not respect this feature - this inconsistency should probably be -fixed in a future release. +** view-buffer now treats special mode-class in the same way that +view-file has since Emacs 22 (ie, it won't enable View mode if the +major-mode is special). ** Passing a nil argument to a minor mode function now turns the mode ON unconditionally. ------------------------------------------------------------ revno: 107008 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 01:06:54 -0800 message: * etc/NEWS: Edit view-buffer entry. See http://debbugs.gnu.org/10650 diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-01-30 08:33:37 +0000 +++ etc/NEWS 2012-01-30 09:06:54 +0000 @@ -999,9 +999,12 @@ ** A backquote not followed by a space is now always treated as new-style. -** Test for special mode-class was moved from view-file to view-buffer. -FIXME: This only says what was changed, but not what are the -programmer-visible consequences. +--- +** View mode's test for a special mode-class is now in view-buffer. +So now this command respects special modes too - previously only +view-file did. Note that commands such as view-file-other-frame still +do not respect this feature - this inconsistency should probably be +fixed in a future release. ** Passing a nil argument to a minor mode function now turns the mode ON unconditionally. ------------------------------------------------------------ revno: 107007 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 00:33:37 -0800 message: * etc/NEWS: Some easy markup. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-01-29 03:17:53 +0000 +++ etc/NEWS 2012-01-30 08:33:37 +0000 @@ -997,8 +997,6 @@ area, excluding any header line. Previously, it counted from the top of the header line. -** Removed obsolete name `e' (use `float-e' instead). - ** A backquote not followed by a space is now always treated as new-style. ** Test for special mode-class was moved from view-file to view-buffer. @@ -1022,6 +1020,7 @@ versions, these regions were delineated by `mouse-drag-overlay', which has now been removed. +--- ** cl.el no longer provides `cl-19'. ** The menu bar bindings's caches are not used any more. @@ -1037,10 +1036,12 @@ iswitchb-default-keybindings, char-bytes, isearch-return-char, make-local-hook ++++ ** The following obsolete variables and varaliases were removed: -checkdoc-minor-keymap, vc-header-alist, directory-sep-char, and -font-lock-defaults-alist. +checkdoc-minor-keymap, vc-header-alist, directory-sep-char, +font-lock-defaults-alist, and e (use float-e). +--- ** The following obsolete files were removed: sc.el, x-menu.el, rnews.el, rnewspost.el ------------------------------------------------------------ revno: 107006 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 00:32:06 -0800 message: * admin/notes/lel-TODO: Small updates for deleted/obsolete features. diff: === modified file 'admin/notes/lel-TODO' --- admin/notes/lel-TODO 2012-01-19 07:21:25 +0000 +++ admin/notes/lel-TODO 2012-01-30 08:32:06 +0000 @@ -7,6 +7,7 @@ * Status Key - -- as yet unknown n/a -- not applicable (internal, uninteresting, etc) + obsolete -- an obsolete feature, to be removed in future todo -- not documented but should be NODE -- documented in or under info node NODE @@ -26,7 +27,6 @@ bytecomp (elisp) Compilation Functions checkdoc (elisp) Documentation Tips cl (cl) - cl-19 n/a cl-compat n/a cl-specs n/a copyright - @@ -47,13 +47,12 @@ generic (elisp) Generic Modes gulp n/a helper - - levents - + levents obsolete lisp-float-type - lisp-mnt - lisp-mode n/a - lmenu - - lselect - - lucid - + lmenu obsolete + lucid obsolete macroexp (elisp) Expansion pp (emacs) Program Indent re-builder - @@ -62,7 +61,7 @@ ring (elisp) Rings rx - shadow - - sregex - + sregex obsolete syntax (elisp) Position Parse testcover - timer (elisp) Timers ------------------------------------------------------------ revno: 107005 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-01-30 00:24:14 -0800 message: authors.el trivia * lisp/emacs-lisp/authors.el (authors-fixed-entries): Remove reference to deleted file rnewspost.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-29 21:52:14 +0000 +++ lisp/ChangeLog 2012-01-30 08:24:14 +0000 @@ -1,3 +1,8 @@ +2012-01-30 Glenn Morris + + * emacs-lisp/authors.el (authors-fixed-entries): + Remove reference to deleted file rnewspost.el. + 2012-01-29 Juanma Barranquero * window.el (window-with-parameter): Remove unused variable `windows'. === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/authors.el 2012-01-30 08:24:14 +0000 @@ -421,7 +421,8 @@ "vt220.el" "vt240.el") ("Motorola" :changed "buff-menu.el") ("Hiroshi Nakano" :changed "ralloc.c") - ("Sundar Narasimhan" :changed "rnewspost.el") + ;; File removed in Emacs 24.1. +;;; ("Sundar Narasimhan" :changed "rnewspost.el") ;; No longer distributed. ;;; ("NeXT, Inc." :wrote "unexnext.c") ("Mark Neale" :changed "fortran.el") ------------------------------------------------------------ revno: 107004 committer: Chong Yidong branch nick: trunk timestamp: Mon 2012-01-30 15:54:00 +0800 message: * etc/tutorials/TUTORIAL: Delete a repeat sentence. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-01-25 06:12:10 +0000 +++ etc/ChangeLog 2012-01-30 07:54:00 +0000 @@ -1,3 +1,7 @@ +2012-01-30 Chong Yidong + + * tutorials/TUTORIAL: Delete a repeat sentence. + 2012-01-25 Mats Lidell * tutorials/TUTORIAL.sv: Updated; synchronize with TUTORIAL. === modified file 'etc/tutorials/TUTORIAL' --- etc/tutorials/TUTORIAL 2012-01-27 11:05:51 +0000 +++ etc/tutorials/TUTORIAL 2012-01-30 07:54:00 +0000 @@ -577,7 +577,6 @@ The buffer list you make with C-x C-b shows you both the buffer name and the file name of every buffer. -ANY text you see in an Emacs window is always part of some buffer. Some buffers do not correspond to files. The buffer named "*Buffer List*", which contains the buffer list that you made with C-x C-b, does not have any file. This TUTORIAL buffer initially did