Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103670. ------------------------------------------------------------ revno: 103670 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-03-16 03:13:31 +0100 message: Add warning for obsolete _emacs init file. * lisp/startup.el (command-line): Warn the user that _emacs is deprecated. * etc/NEWS: Document warning about _emacs. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-03-14 14:13:40 +0000 +++ etc/ChangeLog 2011-03-16 02:13:31 +0000 @@ -1,3 +1,7 @@ +2011-03-16 Juanma Barranquero + + * NEWS: Document warning about _emacs. + 2011-03-14 Michael Albinus * NEWS: `shell' prompts for the shell path name, when the default === modified file 'etc/NEWS' --- etc/NEWS 2011-03-14 14:13:40 +0000 +++ etc/NEWS 2011-03-16 02:13:31 +0000 @@ -62,6 +62,8 @@ ** New command line option `--no-site-lisp' removes site-lisp directories from load-path. -Q now implies this. +** On Windows, Emacs now warns when the obsolete _emacs init file is used. + * Changes in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-16 01:28:20 +0000 +++ lisp/ChangeLog 2011-03-16 02:13:31 +0000 @@ -1,5 +1,9 @@ 2011-03-16 Juanma Barranquero + * startup.el (command-line): Warn the user that _emacs is deprecated. + +2011-03-16 Juanma Barranquero + * progmodes/delphi.el (delphi-search-path, delphi-indent-level) (delphi-verbose, delphi-comment-face, delphi-string-face) (delphi-keyword-face, delphi-ignore-changes, delphi-indent-line) === modified file 'lisp/startup.el' --- lisp/startup.el 2011-03-15 16:21:30 +0000 +++ lisp/startup.el 2011-03-16 02:13:31 +0000 @@ -1006,19 +1006,23 @@ (if init-file-user (let ((user-init-file-1 (cond - ((eq system-type 'ms-dos) - (concat "~" init-file-user "/_emacs")) - ((eq system-type 'windows-nt) - ;; Prefer .emacs on Windows. - (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") - "~/.emacs" - ;; Also support _emacs for compatibility. - (if (directory-files "~" nil "^_emacs\\(\\.elc?\\)?$") - "~/_emacs" - ;; But default to .emacs if _emacs does not exist. - "~/.emacs"))) - (t - (concat "~" init-file-user "/.emacs"))))) + ((eq system-type 'ms-dos) + (concat "~" init-file-user "/_emacs")) + ((not (eq system-type 'windows-nt)) + (concat "~" init-file-user "/.emacs")) + ;; Else deal with the Windows situation + ((directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$") + ;; Prefer .emacs on Windows. + "~/.emacs") + ((directory-files "~" nil "^_emacs\\(\\.elc?\\)?$") + ;; Also support _emacs for compatibility, but warn about it. + (display-warning + 'initialization + "`_emacs' init file is deprecated, please use `.emacs'" + :warning) + "~/_emacs") + (t ;; But default to .emacs if _emacs does not exist. + "~/.emacs")))) ;; This tells `load' to store the file name found ;; into user-init-file. (setq user-init-file t) ------------------------------------------------------------ revno: 103669 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-03-16 02:28:20 +0100 message: lisp/progmodes/delphi.el: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-15 21:01:37 +0000 +++ lisp/ChangeLog 2011-03-16 01:28:20 +0000 @@ -1,6 +1,17 @@ +2011-03-16 Juanma Barranquero + + * progmodes/delphi.el (delphi-search-path, delphi-indent-level) + (delphi-verbose, delphi-comment-face, delphi-string-face) + (delphi-keyword-face, delphi-ignore-changes, delphi-indent-line) + (delphi-mode-abbrev-table, delphi-debug-buffer, delphi-tab) + (delphi-find-unit, delphi-find-current-xdef, delphi-fill-comment) + (delphi-new-comment-line, delphi-font-lock-defaults) + (delphi-debug-mode-map, delphi-mode-syntax-table, delphi-mode): + Fix typos in docstrings. + 2011-03-15 Ken Manheimer - * allout.el (allout-make-topic-prefix) (allout-rebullet-heading): + * allout.el (allout-make-topic-prefix, allout-rebullet-heading): Invert the roles of character and string values for INSTEAD, so a string is used for the more common case of a defaulting prompt. === modified file 'lisp/progmodes/delphi.el' --- lisp/progmodes/delphi.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/delphi.el 2011-03-16 01:28:20 +0000 @@ -26,14 +26,14 @@ ;; To enter Delphi mode when you find a Delphi source file, one must override ;; the auto-mode-alist to associate Delphi with .pas (and .dpr and .dpk) -;; files. Emacs, by default, will otherwise enter Pascal mode. E.g. +;; files. Emacs, by default, will otherwise enter Pascal mode. E.g. ;; ;; (autoload 'delphi-mode "delphi") ;; (setq auto-mode-alist ;; (cons '("\\.\\(pas\\|dpr\\|dpk\\)$" . delphi-mode) auto-mode-alist)) ;; To get keyword, comment, and string literal coloring, be sure that font-lock -;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or +;; is running. One can manually do M-x font-lock-mode in a Delphi buffer, or ;; one can put in .emacs: ;; ;; (add-hook 'delphi-mode-hook 'turn-on-font-lock) @@ -56,8 +56,8 @@ ;; When you have entered Delphi mode, you may get more info by pressing ;; C-h m. -;; This delphi mode implementation is fairly tolerant of syntax errors, relying -;; as much as possible on the indentation of the previous statement. This also +;; This Delphi mode implementation is fairly tolerant of syntax errors, relying +;; as much as possible on the indentation of the previous statement. This also ;; makes it faster and simpler, since there is less searching for properly ;; constructed beginnings. @@ -74,15 +74,16 @@ "True if in debug mode.") (defcustom delphi-search-path "." - "*Directories to search when finding external units. It is a list of -directory strings. If only a single directory, it can be a single -string instead of a list. If a directory ends in \"...\" then that -directory is recursively searched." + "*Directories to search when finding external units. +It is a list of directory strings. If only a single directory, +it can be a single string instead of a list. If a directory +ends in \"...\" then that directory is recursively searched." :type 'string :group 'delphi) (defcustom delphi-indent-level 3 - "*Indentation of Delphi statements with respect to containing block. E.g. + "*Indentation of Delphi statements with respect to containing block. +E.g. begin // This is an indent of 3. @@ -117,7 +118,7 @@ :group 'delphi) (defcustom delphi-verbose t ; nil - "*If true then delphi token processing progress is reported to the user." + "*If true then Delphi token processing progress is reported to the user." :type 'boolean :group 'delphi) @@ -137,17 +138,17 @@ :group 'delphi) (defcustom delphi-comment-face 'font-lock-comment-face - "*Face used to color delphi comments." + "*Face used to color Delphi comments." :type 'face :group 'delphi) (defcustom delphi-string-face 'font-lock-string-face - "*Face used to color delphi strings." + "*Face used to color Delphi strings." :type 'face :group 'delphi) (defcustom delphi-keyword-face 'font-lock-keyword-face - "*Face used to color delphi keywords." + "*Face used to color Delphi keywords." :type 'face :group 'delphi) @@ -720,9 +721,9 @@ (delphi-progress-done))))) (defvar delphi-ignore-changes t - "Internal flag to control if the delphi-mode responds to buffer changes. -Defaults to t in case the delphi-after-change function is called on a -non-delphi buffer. Set to nil in a delphi buffer. To override, just do: + "Internal flag to control if the Delphi mode responds to buffer changes. +Defaults to t in case the `delphi-after-change' function is called on a +non-Delphi buffer. Set to nil in a Delphi buffer. To override, just do: (let ((delphi-ignore-changes t)) ...)") (defun delphi-after-change (change-start change-end old-length) @@ -1521,8 +1522,8 @@ indent))) (defun delphi-indent-line () - "Indent the current line according to the current language construct. If -before the indent, the point is moved to the indent." + "Indent the current line according to the current language construct. +If before the indent, the point is moved to the indent." (interactive) (delphi-save-match-data (let ((marked-point (point-marker)) ; Maintain our position reliably. @@ -1547,7 +1548,7 @@ (set-marker marked-point nil)))) (defvar delphi-mode-abbrev-table nil - "Abbrev table in use in delphi-mode buffers.") + "Abbrev table in use in Delphi mode buffers.") (define-abbrev-table 'delphi-mode-abbrev-table ()) (defmacro delphi-ensure-buffer (buffer-var buffer-name) @@ -1568,7 +1569,7 @@ ;; Debugging helpers: (defvar delphi-debug-buffer nil - "Buffer to write delphi-mode debug messages to. Created on demand.") + "Buffer to write Delphi mode debug messages to. Created on demand.") (defun delphi-debug-log (format-string &rest args) ;; Writes a message to the log buffer. @@ -1679,7 +1680,7 @@ (defun delphi-tab () "Indent the region, when Transient Mark mode is enabled and the region is -active. Otherwise, indent the current line or insert a TAB, depending on the +active. Otherwise, indent the current line or insert a TAB, depending on the value of `delphi-tab-always-indents' and the current line position." (interactive) (cond ((use-region-p) @@ -1768,8 +1769,8 @@ nil)) (defun delphi-find-unit (unit) - "Finds the specified delphi source file according to `delphi-search-path'. -If no extension is specified, .pas is assumed. Creates a buffer for the unit." + "Find the specified Delphi source file according to `delphi-search-path'. +If no extension is specified, .pas is assumed. Creates a buffer for the unit." (interactive "sDelphi unit name: ") (let* ((unit-file (if (string-match "^\\(.*\\)\\.[a-z]+$" unit) unit @@ -1791,7 +1792,7 @@ "Find the definition of the identifier under the current point, searching in external units if necessary (as listed in the current unit's use clause). The set of directories to search for a unit is specified by the global variable -delphi-search-path." +`delphi-search-path'." (interactive) (error "delphi-find-current-xdef: not implemented yet")) @@ -1802,7 +1803,7 @@ (error "delphi-find-current-body: not implemented yet")) (defun delphi-fill-comment () - "Fills the text of the current comment, according to `fill-column'. + "Fill the text of the current comment, according to `fill-column'. An error is raised if not in a comment." (interactive) (save-excursion @@ -1888,8 +1889,8 @@ (delphi-progress-done))))))) (defun delphi-new-comment-line () - "If in a // comment, does a newline, indented such that one is still in the -comment block. If not in a // comment, just does a normal newline." + "If in a // comment, do a newline, indented such that one is still in the +comment block. If not in a // comment, just does a normal newline." (interactive) (let ((comment (delphi-current-token))) (if (not (eq 'comment-single-line (delphi-token-kind comment))) @@ -1923,7 +1924,7 @@ nil ; Syntax begin movement doesn't apply (font-lock-fontify-region-function . delphi-fontify-region) (font-lock-verbose . delphi-fontifying-progress-step)) - "Delphi mode font-lock defaults. Syntactic fontification is ignored.") + "Delphi mode font-lock defaults. Syntactic fontification is ignored.") (defvar delphi-debug-mode-map (let ((kmap (make-sparse-keymap))) @@ -1944,7 +1945,7 @@ ("x" delphi-debug-show-is-stable) )) kmap) - "Keystrokes for delphi-mode debug commands.") + "Keystrokes for Delphi mode debug commands.") (defvar delphi-mode-map (let ((kmap (make-sparse-keymap))) @@ -1964,7 +1965,7 @@ "Keymap used in Delphi mode.") (defconst delphi-mode-syntax-table (make-syntax-table) - "Delphi mode's syntax table. It is just a standard syntax table. + "Delphi mode's syntax table. It is just a standard syntax table. This is ok since we do our own keyword/comment/string face coloring.") ;;;###autoload @@ -1976,7 +1977,7 @@ \\[delphi-fill-comment]\t- Fill the current comment. \\[delphi-new-comment-line]\t- If in a // comment, do a new comment line. -M-x indent-region also works for indenting a whole region. +\\[indent-region] also works for indenting a whole region. Customization: @@ -1996,21 +1997,21 @@ `delphi-search-path' (default .) Directories to search when finding external units. `delphi-verbose' (default nil) - If true then delphi token processing progress is reported to the user. + If true then Delphi token processing progress is reported to the user. Coloring: `delphi-comment-face' (default font-lock-comment-face) - Face used to color delphi comments. + Face used to color Delphi comments. `delphi-string-face' (default font-lock-string-face) - Face used to color delphi strings. + Face used to color Delphi strings. `delphi-keyword-face' (default font-lock-keyword-face) - Face used to color delphi keywords. + Face used to color Delphi keywords. `delphi-other-face' (default nil) Face used to color everything else. -Turning on Delphi mode calls the value of the variable delphi-mode-hook with -no args, if that value is non-nil." +Turning on Delphi mode calls the value of the variable `delphi-mode-hook' +with no args, if that value is non-nil." (interactive) (kill-all-local-variables) (use-local-map delphi-mode-map) ------------------------------------------------------------ revno: 103668 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-03-16 01:53:19 +0100 message: src/emacs.c (USAGE3): Doc fixes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-15 18:38:57 +0000 +++ src/ChangeLog 2011-03-16 00:53:19 +0000 @@ -1,3 +1,7 @@ +2011-03-16 Juanma Barranquero + + * emacs.c (USAGE3): Doc fixes. + 2011-03-15 Andreas Schwab * coding.c (detect_coding_iso_2022): Reorganize code to clarify === modified file 'src/emacs.c' --- src/emacs.c 2011-02-06 01:25:41 +0000 +++ src/emacs.c 2011-03-16 00:53:19 +0000 @@ -141,7 +141,7 @@ Lisp_Object Qrisky_local_variable; -/* If non-zero, emacs should not attempt to use a window-specific code, +/* If non-zero, Emacs should not attempt to use a window-specific code, but instead should use the virtual terminal under which it was started. */ int inhibit_window_system; @@ -169,7 +169,6 @@ #define MAX_HEAP_BSS_DIFF (1024*1024) /* Nonzero means running Emacs without interactive terminal. */ - int noninteractive; /* Nonzero means remove site-lisp directories from load-path. */ @@ -249,14 +248,14 @@ --border-color, -bd COLOR main border color\n\ --border-width, -bw WIDTH width of main border\n\ --color, --color=MODE override color mode for character terminals;\n\ - MODE defaults to `auto', and can also\n\ - be `never', `auto', `always',\n\ + MODE defaults to `auto', and\n\ + can also be `never', `always',\n\ or a mode name like `ansi8'\n\ --cursor-color, -cr COLOR color of the Emacs cursor indicating point\n\ --font, -fn FONT default font; must be fixed-width\n\ --foreground-color, -fg COLOR window foreground color\n\ --fullheight, -fh make the first frame high as the screen\n\ ---fullscreen, -fs make first frame fullscreen\n\ +--fullscreen, -fs make the first frame fullscreen\n\ --fullwidth, -fw make the first frame wide as the screen\n\ --maximized, -mm make the first frame maximized\n\ --geometry, -g GEOMETRY window geometry\n\ @@ -576,7 +575,8 @@ enough information to do it right. */ static int -argmatch (char **argv, int argc, const char *sstr, const char *lstr, int minlen, char **valptr, int *skipptr) +argmatch (char **argv, int argc, const char *sstr, const char *lstr, + int minlen, char **valptr, int *skipptr) { char *p = NULL; int arglen; ------------------------------------------------------------ revno: 103667 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-03-15 22:57:48 +0000 message: gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if we're selecting a group with unread articles. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-15 22:38:41 +0000 +++ lisp/gnus/ChangeLog 2011-03-15 22:57:48 +0000 @@ -1,5 +1,8 @@ 2011-03-15 Lars Magne Ingebrigtsen + * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if + we're selecting a group with unread articles. + * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. * gssapi.el: New file separated out from imap.el to provide a general === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-03-15 22:43:25 +0000 +++ lisp/gnus/gnus-sum.el 2011-03-15 22:57:48 +0000 @@ -5798,7 +5798,8 @@ (defun gnus-articles-to-read (group &optional read-all) "Find out what articles the user wants to read." - (let* ((articles + (let* ((only-read-p t) + (articles ;; Select all articles if `read-all' is non-nil, or if there ;; are no unread articles. (if (or read-all @@ -5822,6 +5823,7 @@ (gnus-uncompress-range (gnus-active group))) (gnus-cache-articles-in-group group)) ;; Select only the "normal" subset of articles. + (setq only-read-p nil) (gnus-sorted-nunion (gnus-sorted-union gnus-newsgroup-dormant gnus-newsgroup-marked) gnus-newsgroup-unreads))) @@ -5845,18 +5847,25 @@ (let* ((cursor-in-echo-area nil) (initial (gnus-parameter-large-newsgroup-initial gnus-newsgroup-name)) + (default (if only-read-p + (or initial gnus-large-newsgroup) + number)) (input (read-string - (format - "How many articles from %s (available %d, default %d): " - (gnus-group-decoded-name - (gnus-group-real-name gnus-newsgroup-name)) - number - (or initial gnus-large-newsgroup)) - nil - nil - (number-to-string - (or initial gnus-large-newsgroup))))) + (if only-read-p + (format + "How many articles from %s (available %d, default %d): " + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) + number default) + (format + "How many articles from %s (%d available): " + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) + default)) + nil + nil + (number-to-string default)))) (if (string-match "^[ \t]*$" input) number input))) ((and (> scored marked) (< scored number) (> (- scored number) 20)) ------------------------------------------------------------ revno: 103666 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-03-15 22:43:25 +0000 message: Indent. diff: === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-03-15 22:38:41 +0000 +++ lisp/gnus/gnus-sum.el 2011-03-15 22:43:25 +0000 @@ -5849,12 +5849,14 @@ (read-string (format "How many articles from %s (available %d, default %d): " - (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) number (or initial gnus-large-newsgroup)) nil nil - (number-to-string (or initial gnus-large-newsgroup))))) + (number-to-string + (or initial gnus-large-newsgroup))))) (if (string-match "^[ \t]*$" input) number input))) ((and (> scored marked) (< scored number) (> (- scored number) 20)) @@ -5862,7 +5864,8 @@ (read-string (format "%s %s (%d scored, %d total): " "How many articles from" - (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) scored number)))) (if (string-match "^[ \t]*$" input) number input))) ------------------------------------------------------------ revno: 103665 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-03-15 22:38:41 +0000 message: Merge changes made in Gnus trunk. message.texi (Insertion Variables): Document message-cite-style. nnimap.el (nnimap-open-connection-1): Allow `network-only', too. gssapi.el: New file separated out from imap.el to provide a general Kerberos 5 connection facility for Emacs. message.el (message-elide-ellipsis): Document the format spec ellipsis. message.el (message-elide-region): Allow the ellipsis to say how many lines were removed. gnus-win.el (gnus-configure-frame): Protect against trying to restore window configurations containing buffers that are now dead. nnimap.el (nnimap-parse-flags): Remove all MODSEQ entries before parsing to avoid integer overflows. (nnimap-parse-flags): Simplify the last change. (nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be too large for 32-bit Emacsen. gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on XEmacs, which was one character too wide. gnus-sum.el (gnus-articles-to-read): Use gnus-large-newsgroup as default number of articles to display. (gnus-articles-to-read): Use pretty names for prompt. gnus-int.el (gnus-open-server): Ditto. gnus-start.el (gnus-activate-group): Give a backtrace if debug-on-quit is set and the user hits `C-g'. (gnus-read-active-file): Ditto. gnus-group.el (gnus-group-read-ephemeral-group): Ditto. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-03-14 16:39:58 +0000 +++ doc/misc/ChangeLog 2011-03-15 22:38:41 +0000 @@ -1,4 +1,8 @@ -2011-03-14 Michael Albinus +2011-03-15 Antoine Levitt + + * message.texi (Insertion Variables): Document message-cite-style. + +2011-03-14 Michael Albinus * tramp.texi (Remote processes): New subsection "Running shell on a remote host". === modified file 'doc/misc/message.texi' --- doc/misc/message.texi 2011-03-08 14:26:05 +0000 +++ doc/misc/message.texi 2011-03-15 22:38:41 +0000 @@ -1930,6 +1930,25 @@ @section Insertion Variables @table @code +@item message-cite-style +@vindex message-cite-style +The overall style to be used when replying to messages. This controls +things like where the reply should be put relative to the original, +how the citation is formatted, where the signature goes, etc. + +Value is either @code{nil} (no variable overrides) or a let-style list +of pairs @code{(VARIABLE VALUE)} to override default values. + +See @code{gnus-posting-styles} to set this variable for specific +groups. Presets to impersonate popular mail agents are available in the +@code{message-cite-style-*} variables. + +@item message-cite-reply-position +@vindex message-cite-reply-position +Where the reply should be positioned. Available styles are +@code{traditional} to reply inline, @code{above} for top-posting, and +@code{below} for bottom-posting + @item message-ignored-cited-headers @vindex message-ignored-cited-headers All headers that match this regexp will be removed from yanked === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-15 17:39:56 +0000 +++ lisp/gnus/ChangeLog 2011-03-15 22:38:41 +0000 @@ -1,8 +1,55 @@ +2011-03-15 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. + + * gssapi.el: New file separated out from imap.el to provide a general + Kerberos 5 connection facility for Emacs. + + * message.el (message-elide-ellipsis): Document the format spec + ellipsis. + +2011-03-15 Reiner Steib + + * message.el (message-elide-region): Allow the ellipsis to say how many + lines were removed. + +2011-03-15 Lars Magne Ingebrigtsen + + * gnus-win.el (gnus-configure-frame): Protect against trying to restore + window configurations containing buffers that are now dead. + + * nnimap.el (nnimap-parse-flags): Remove all MODSEQ entries before + parsing to avoid integer overflows. + (nnimap-parse-flags): Simplify the last change. + (nnimap-parse-flags): Store HIGHESTMODSEQ as a string, since it may be + too large for 32-bit Emacsen. + 2011-03-15 Stefan Monnier * auth-source.el (auth-source-netrc-create): * message.el (message-yank-original): Fix use of `case'. +2011-03-15 Nelson Ferreira (tiny change) + + * gnus-art.el (gnus-article-treat-body-boundary): Fix boundary width on + XEmacs, which was one character too wide. + +2011-03-09 Antoine Levitt + + * gnus-sum.el (gnus-articles-to-read): Use gnus-large-newsgroup as + default number of articles to display. + (gnus-articles-to-read): Use pretty names for prompt. + +2011-03-15 Lars Magne Ingebrigtsen + + * gnus-int.el (gnus-open-server): Ditto. + + * gnus-start.el (gnus-activate-group): Give a backtrace if + debug-on-quit is set and the user hits `C-g'. + (gnus-read-active-file): Ditto. + + * gnus-group.el (gnus-group-read-ephemeral-group): Ditto. + 2011-03-15 Teodor Zlatanov * message.el (message-yank-original): Use cond instead of CL case. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-03-02 12:34:12 +0000 +++ lisp/gnus/gnus-art.el 2011-03-15 22:38:41 +0000 @@ -2337,10 +2337,12 @@ (let ((start (point))) (insert "X-Boundary: ") (gnus-add-text-properties start (point) '(invisible t intangible t)) - (insert (let (str) - (while (>= (window-width) (length str)) + (insert (let (str (max (window-width))) + (if (featurep 'xemacs) + (setq max (1- max))) + (while (>= max (length str)) (setq str (concat str gnus-body-boundary-delimiter))) - (substring str 0 (window-width))) + (substring str 0 max)) "\n") (gnus-put-text-property start (point) 'gnus-decoration 'header))))) === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-03-05 21:56:00 +0000 +++ lisp/gnus/gnus-group.el 2011-03-15 22:38:41 +0000 @@ -2313,9 +2313,10 @@ gnus-fetch-old-ephemeral-headers)) (gnus-group-read-group (or number t) t group select-articles)) group) - ;;(error nil) (quit - (message "Quit reading the ephemeral group") + (if debug-on-quit + (debug "Quit") + (message "Quit reading the ephemeral group")) nil))))) (defcustom gnus-gmane-group-download-format === modified file 'lisp/gnus/gnus-int.el' --- lisp/gnus/gnus-int.el 2011-01-28 02:07:48 +0000 +++ lisp/gnus/gnus-int.el 2011-03-15 22:38:41 +0000 @@ -270,7 +270,9 @@ server (error-message-string err)) nil) (quit - (gnus-message 1 "Quit trying to open server %s" server) + (if debug-on-quit + (debug "Quit") + (gnus-message 1 "Quit trying to open server %s" server)) nil))) open-offline) ;; If this hasn't been opened before, we add it to the list. === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2011-03-08 14:26:05 +0000 +++ lisp/gnus/gnus-start.el 2011-03-15 22:38:41 +0000 @@ -1462,9 +1462,10 @@ (inline (gnus-request-group group (or dont-sub-check dont-check) method (gnus-get-info group))) - ;;(error nil) (quit - (message "Quit activating %s" group) + (if debug-on-quit + (debug "Quit") + (message "Quit activating %s" group)) nil))) (unless dont-check (setq active (gnus-parse-active)) @@ -2004,7 +2005,9 @@ ;; We catch C-g so that we can continue past servers ;; that do not respond. (quit - (message "Quit reading the active file") + (if debug-on-quit + (debug "Quit") + (message "Quit reading the active file")) nil)))))))) (defun gnus-read-active-file-1 (method force) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-03-05 13:01:56 +0000 +++ lisp/gnus/gnus-sum.el 2011-03-15 22:38:41 +0000 @@ -5848,13 +5848,13 @@ (input (read-string (format - "How many articles from %s (%s %d): " - (gnus-group-decoded-name gnus-newsgroup-name) - (if initial "max" "default") - number) - (if initial - (cons (number-to-string initial) - 0))))) + "How many articles from %s (available %d, default %d): " + (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) + number + (or initial gnus-large-newsgroup)) + nil + nil + (number-to-string (or initial gnus-large-newsgroup))))) (if (string-match "^[ \t]*$" input) number input))) ((and (> scored marked) (< scored number) (> (- scored number) 20)) @@ -5862,7 +5862,7 @@ (read-string (format "%s %s (%d scored, %d total): " "How many articles from" - (gnus-group-decoded-name group) + (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) scored number)))) (if (string-match "^[ \t]*$" input) number input))) === modified file 'lisp/gnus/gnus-win.el' --- lisp/gnus/gnus-win.el 2011-01-28 23:07:38 +0000 +++ lisp/gnus/gnus-win.el 2011-03-15 22:38:41 +0000 @@ -268,8 +268,10 @@ (error "Invalid buffer type: %s" type)) (let ((buf (gnus-get-buffer-create (gnus-window-to-buffer-helper buffer)))) - (if (eq buf (window-buffer (selected-window))) (set-buffer buf) - (switch-to-buffer buf))) + (when (buffer-name buf) + (if (eq buf (window-buffer (selected-window))) + (set-buffer buf) + (switch-to-buffer buf)))) (when (memq 'frame-focus split) (setq gnus-window-frame-focus window)) ;; We return the window if it has the `point' spec. === added file 'lisp/gnus/gssapi.el' --- lisp/gnus/gssapi.el 1970-01-01 00:00:00 +0000 +++ lisp/gnus/gssapi.el 2011-03-15 22:38:41 +0000 @@ -0,0 +1,105 @@ +;;; gssapi.el --- GSSAPI/Kerberos 5 interface for Emacs + +;; Copyright (C) 2011 Free Software Foundation, Inc. + +;; Author: Simon Josefsson +;; Lars Magne Ingebrigtsen +;; Keywords: network + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'format-spec) + +(defcustom gssapi-program (list + (concat "gsasl %s %p " + "--mechanism GSSAPI " + "--authentication-id %l") + "imtest -m gssapi -u %l -p %p %s") + "List of strings containing commands for GSSAPI (krb5) authentication. +%s is replaced with server hostname, %p with port to connect to, and +%l with the value of `imap-default-user'. The program should accept +IMAP commands on stdin and return responses to stdout. Each entry in +the list is tried until a successful connection is made." + :group 'network + :type '(repeat string)) + +(defun open-gssapi-stream (name buffer server port) + (let ((cmds gssapi-program) + cmd done) + (with-current-buffer buffer + (while (and (not done) + (setq cmd (pop cmds))) + (message "Opening GSSAPI connection with `%s'..." cmd) + (erase-buffer) + (let* ((coding-system-for-read 'binary) + (coding-system-for-write 'binary) + (process (start-process + name buffer shell-file-name shell-command-switch + (format-spec + cmd + (format-spec-make + ?s server + ?p (number-to-string port) + ?l imap-default-user)))) + response) + (when process + (while (and (memq (process-status process) '(open run)) + (goto-char (point-min)) + ;; Athena IMTEST can output SSL verify errors + (or (while (looking-at "^verify error:num=") + (forward-line)) + t) + (or (while (looking-at "^TLS connection established") + (forward-line)) + t) + ;; cyrus 1.6.x (13? < x <= 22) queries capabilities + (or (while (looking-at "^C:") + (forward-line)) + t) + ;; cyrus 1.6 imtest print "S: " before server greeting + (or (not (looking-at "S: ")) + (forward-char 3) + t) + ;; GNU SASL may print 'Trying ...' first. + (or (not (looking-at "Trying ")) + (forward-line) + t) + (not (and (looking-at "\\* \\(OK\\|PREAUTH\\|BYE\\) ") + ;; success in imtest 1.6: + (re-search-forward + (concat "^\\(\\(Authenticat.*\\)\\|\\(" + "Client authentication " + "finished.*\\)\\)") + nil t) + (setq response (match-string 1))))) + (accept-process-output process 1) + (sit-for 1)) + (erase-buffer) + (message "GSSAPI IMAP connection: %s" (or response "failed")) + (if (and response (let ((case-fold-search nil)) + (not (string-match "failed" response)))) + (setq done process) + (delete-process process) + nil)))) + done))) + +(provide 'gssapi) + +;;; gssapi.el ends here === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-03-15 17:39:56 +0000 +++ lisp/gnus/message.el 2011-03-15 22:38:41 +0000 @@ -49,6 +49,7 @@ (require 'mail-parse) (require 'mml) (require 'rfc822) +(require 'format-spec) (autoload 'mailclient-send-it "mailclient") ;; Emacs 22 or contrib/ @@ -438,7 +439,10 @@ :group 'message-various) (defcustom message-elide-ellipsis "\n[...]\n\n" - "*The string which is inserted for elided text." + "*The string which is inserted for elided text. +This is a format-spec string, and you can use %l to say how many +lines were removed, and %c to say how many characters were +removed." :type 'string :link '(custom-manual "(message)Various Commands") :group 'message-various) @@ -3535,8 +3539,12 @@ An ellipsis (from `message-elide-ellipsis') will be inserted where the text was killed." (interactive "r") - (kill-region b e) - (insert message-elide-ellipsis)) + (let ((lines (count-lines b e)) + (chars (- e b))) + (kill-region b e) + (insert (format-spec message-elide-ellipsis + `((?l . ,lines) + (?c . ,chars)))))) (defvar message-caesar-translation-table nil) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-03-09 13:39:35 +0000 +++ lisp/gnus/nnimap.el 2011-03-15 22:38:41 +0000 @@ -340,6 +340,7 @@ (ports (cond ((or (eq nnimap-stream 'network) + (eq nnimap-stream 'network-only) (eq nnimap-stream 'starttls)) (nnheader-message 7 "Opening connection to %s..." nnimap-address) @@ -1452,6 +1453,11 @@ ;; Change \Delete etc to %Delete, so that the reader can read it. (subst-char-in-region (point-min) (point-max) ?\\ ?% t) + ;; Remove any MODSEQ entries in the buffer, because they may contain + ;; numbers that are too large for 32-bit Emacsen. + (while (re-search-forward " MODSEQ ([0-9]+)" nil t) + (replace-match "" t t)) + (goto-char (point-min)) (let (start end articles groups uidnext elems permanent-flags uidvalidity vanished highestmodseq) (dolist (elem sequences) @@ -1491,9 +1497,9 @@ (match-string 1))) (goto-char start) (setq highestmodseq - (and (search-forward "HIGHESTMODSEQ " + (and (re-search-forward "HIGHESTMODSEQ \\([0-9]+\\)" (or end (point-min)) t) - (read (current-buffer)))) + (match-string 1))) (goto-char end) (forward-line -1)) ;; The UID FETCH FLAGS was successful. @@ -1507,18 +1513,7 @@ (goto-char end)) (while (re-search-forward "^\\* [0-9]+ FETCH " start t) (let ((p (point))) - ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID - ;; 12509 MODSEQ (13419098521433281274))" we get an - ;; overflow-error. The handler simply deletes that large number - ;; and reads again. But maybe there's a better fix... - (setq elems (condition-case nil (read (current-buffer)) - (overflow-error - ;; After an overflow-error, point is just after - ;; the too large number. So delete it and try - ;; again. - (delete-region (point) (progn (backward-word) (point))) - (goto-char p) - (read (current-buffer))))) + (setq elems (read (current-buffer))) (push (cons (cadr (memq 'UID elems)) (cadr (memq 'FLAGS elems))) articles))) @@ -1674,6 +1669,8 @@ (goto-char (point-max))) openp) (quit + (when debug-on-quit + (debug "Quit")) ;; The user hit C-g while we were waiting: kill the process, in case ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind ;; NAT routers). ------------------------------------------------------------ revno: 103664 committer: Ken Manheimer branch nick: trunk timestamp: Tue 2011-03-15 17:01:37 -0400 message: * allout.el (allout-make-topic-prefix) (allout-rebullet-heading): Invert the roles of character and string values for INSTEAD, so a string is used for the more common case of a defaulting prompt. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-15 17:39:56 +0000 +++ lisp/ChangeLog 2011-03-15 21:01:37 +0000 @@ -1,3 +1,9 @@ +2011-03-15 Ken Manheimer + + * allout.el (allout-make-topic-prefix) (allout-rebullet-heading): + Invert the roles of character and string values for INSTEAD, so a + string is used for the more common case of a defaulting prompt. + 2011-03-15 Stefan Monnier * progmodes/ruby-mode.el (ruby-backward-sexp): === modified file 'lisp/allout.el' --- lisp/allout.el 2011-03-15 02:46:18 +0000 +++ lisp/allout.el 2011-03-15 21:01:37 +0000 @@ -3496,8 +3496,8 @@ If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a string, then the first character of the string will be used -- a character, then the user is solicited for bullet, with that char as default +- a \(numeric) character, then character's string representation is used +- a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default \(INSTEAD overrides other options, including, eg, a distinctive @@ -3554,10 +3554,12 @@ ((progn (setq body (make-string (- depth 2) ?\ )) ;; The actual condition: instead) - (let* ((got - (if (and (stringp instead)(> (length instead) 0)) - (substring instead 0 1) - (allout-solicit-alternate-bullet depth instead)))) + (let ((got (cond ((stringp instead) + (if (> (length instead) 0) + (allout-solicit-alternate-bullet + depth (substring instead 0 1)))) + ((characterp instead) (char-to-string instead)) + (t (allout-solicit-alternate-bullet depth))))) ;; Gotta check whether we're numbering and got a numbered bullet: (setq numbering (and allout-numbered-bullet (not (and number-control (not index))) @@ -3951,8 +3953,8 @@ If INSTEAD is: - nil, then the bullet char for the context is used, per distinction or depth -- a string, then the first character of the string will be used -- a character, then the user is solicited for bullet, with that char as default +- a \(numeric) character, then character's string representation is used +- a string, then the user is asked for bullet with the first char as default - anything else, the user is solicited with bullet char per context as default Second arg DEPTH forces the topic prefix to that depth, regardless ------------------------------------------------------------ revno: 103663 committer: Andreas Schwab branch nick: emacs timestamp: Tue 2011-03-15 19:38:57 +0100 message: * src/coding.c (detect_coding_iso_2022): Reorganize code to clarify structure. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-14 17:22:53 +0000 +++ src/ChangeLog 2011-03-15 18:38:57 +0000 @@ -1,3 +1,8 @@ +2011-03-15 Andreas Schwab + + * coding.c (detect_coding_iso_2022): Reorganize code to clarify + structure. + 2011-03-14 Juanma Barranquero * lisp.h (VWindow_system, Qfile_name_history): === modified file 'src/coding.c' --- src/coding.c 2011-03-08 07:36:31 +0000 +++ src/coding.c 2011-03-15 18:38:57 +0000 @@ -2954,12 +2954,7 @@ const unsigned char *src_end = coding->source + coding->src_bytes; int multibytep = coding->src_multibyte; int single_shifting = 0; - - /* FIXME: Does ID need to be initialized here? The "End of composition" - code below does not initialize ID even though ID is used - afterwards, and perhaps that is a bug. */ - int id = 0; - + int id; int c, c1; int consumed_chars = 0; int i; @@ -2999,40 +2994,11 @@ break; single_shifting = 0; ONE_MORE_BYTE (c); - if (c >= '(' && c <= '/') - { - /* Designation sequence for a charset of dimension 1. */ - ONE_MORE_BYTE (c1); - if (c1 < ' ' || c1 >= 0x80 - || (id = iso_charset_table[0][c >= ','][c1]) < 0) - /* Invalid designation sequence. Just ignore. */ - break; - } - else if (c == '$') - { - /* Designation sequence for a charset of dimension 2. */ - ONE_MORE_BYTE (c); - if (c >= '@' && c <= 'B') - /* Designation for JISX0208.1978, GB2312, or JISX0208. */ - id = iso_charset_table[1][0][c]; - else if (c >= '(' && c <= '/') - { - ONE_MORE_BYTE (c1); - if (c1 < ' ' || c1 >= 0x80 - || (id = iso_charset_table[1][c >= ','][c1]) < 0) - /* Invalid designation sequence. Just ignore. */ - break; - } - else - /* Invalid designation sequence. Just ignore it. */ - break; - } - else if (c == 'N' || c == 'O') + if (c == 'N' || c == 'O') { /* ESC for SS2 or SS3. */ single_shifting = 1; rejected |= CATEGORY_MASK_ISO_7BIT | CATEGORY_MASK_ISO_8BIT; - break; } else if (c == '1') { @@ -3048,36 +3014,66 @@ { /* ESC for start/end composition. */ composition_count = 0; - break; } else { - /* Invalid escape sequence. Just ignore it. */ - break; + if (c >= '(' && c <= '/') + { + /* Designation sequence for a charset of dimension 1. */ + ONE_MORE_BYTE (c1); + if (c1 < ' ' || c1 >= 0x80 + || (id = iso_charset_table[0][c >= ','][c1]) < 0) + /* Invalid designation sequence. Just ignore. */ + break; + } + else if (c == '$') + { + /* Designation sequence for a charset of dimension 2. */ + ONE_MORE_BYTE (c); + if (c >= '@' && c <= 'B') + /* Designation for JISX0208.1978, GB2312, or JISX0208. */ + id = iso_charset_table[1][0][c]; + else if (c >= '(' && c <= '/') + { + ONE_MORE_BYTE (c1); + if (c1 < ' ' || c1 >= 0x80 + || (id = iso_charset_table[1][c >= ','][c1]) < 0) + /* Invalid designation sequence. Just ignore. */ + break; + } + else + /* Invalid designation sequence. Just ignore it. */ + break; + } + else + { + /* Invalid escape sequence. Just ignore it. */ + break; + } + + /* We found a valid designation sequence for CHARSET. */ + rejected |= CATEGORY_MASK_ISO_8BIT; + if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7], + id)) + found |= CATEGORY_MASK_ISO_7; + else + rejected |= CATEGORY_MASK_ISO_7; + if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_tight], + id)) + found |= CATEGORY_MASK_ISO_7_TIGHT; + else + rejected |= CATEGORY_MASK_ISO_7_TIGHT; + if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_else], + id)) + found |= CATEGORY_MASK_ISO_7_ELSE; + else + rejected |= CATEGORY_MASK_ISO_7_ELSE; + if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_8_else], + id)) + found |= CATEGORY_MASK_ISO_8_ELSE; + else + rejected |= CATEGORY_MASK_ISO_8_ELSE; } - - /* We found a valid designation sequence for CHARSET. */ - rejected |= CATEGORY_MASK_ISO_8BIT; - if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7], - id)) - found |= CATEGORY_MASK_ISO_7; - else - rejected |= CATEGORY_MASK_ISO_7; - if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_tight], - id)) - found |= CATEGORY_MASK_ISO_7_TIGHT; - else - rejected |= CATEGORY_MASK_ISO_7_TIGHT; - if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_7_else], - id)) - found |= CATEGORY_MASK_ISO_7_ELSE; - else - rejected |= CATEGORY_MASK_ISO_7_ELSE; - if (SAFE_CHARSET_P (&coding_categories[coding_category_iso_8_else], - id)) - found |= CATEGORY_MASK_ISO_8_ELSE; - else - rejected |= CATEGORY_MASK_ISO_8_ELSE; break; case ISO_CODE_SO: @@ -3105,13 +3101,32 @@ rejected |= CATEGORY_MASK_ISO_7BIT; if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1]) & CODING_ISO_FLAG_SINGLE_SHIFT) - found |= CATEGORY_MASK_ISO_8_1, single_shifting = 1; + { + found |= CATEGORY_MASK_ISO_8_1; + single_shifting = 1; + } if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_2]) & CODING_ISO_FLAG_SINGLE_SHIFT) - found |= CATEGORY_MASK_ISO_8_2, single_shifting = 1; + { + found |= CATEGORY_MASK_ISO_8_2; + single_shifting = 1; + } if (single_shifting) break; - goto check_extra_latin; + check_extra_latin: + if (! VECTORP (Vlatin_extra_code_table) + || NILP (XVECTOR (Vlatin_extra_code_table)->contents[c])) + { + rejected = CATEGORY_MASK_ISO; + break; + } + if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1]) + & CODING_ISO_FLAG_LATIN_EXTRA) + found |= CATEGORY_MASK_ISO_8_1; + else + rejected |= CATEGORY_MASK_ISO_8_1; + rejected |= CATEGORY_MASK_ISO_8_2; + break; default: if (c < 0) @@ -3162,20 +3177,6 @@ } break; } - check_extra_latin: - single_shifting = 0; - if (! VECTORP (Vlatin_extra_code_table) - || NILP (XVECTOR (Vlatin_extra_code_table)->contents[c])) - { - rejected = CATEGORY_MASK_ISO; - break; - } - if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1]) - & CODING_ISO_FLAG_LATIN_EXTRA) - found |= CATEGORY_MASK_ISO_8_1; - else - rejected |= CATEGORY_MASK_ISO_8_1; - rejected |= CATEGORY_MASK_ISO_8_2; } } detect_info->rejected |= CATEGORY_MASK_ISO; ------------------------------------------------------------ revno: 103662 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-03-15 13:39:56 -0400 message: Fix misuse of quote in `case'. * lisp/progmodes/ruby-mode.el (ruby-backward-sexp): * lisp/progmodes/ebrowse.el (ebrowse-draw-file-member-info): * lisp/play/gamegrid.el (gamegrid-make-face): * lisp/play/bubbles.el (bubbles--grid-width, bubbles--grid-height) (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images): * lisp/notifications.el (notifications-notify): * lisp/net/xesam.el (xesam-search-engines): * lisp/net/quickurl.el (quickurl-list-insert): * lisp/vc/vc-hg.el (vc-hg-dir-printer): Fix use of case. * lisp/gnus/auth-source.el (auth-source-netrc-create): * lisp/gnus/message.el (message-yank-original): Fix use of `case'. * lisp/org/org-src.el (org-src-switch-to-buffer): * lisp/org/org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot): * lisp/org/org-mouse.el (org-mouse-agenda-type): * lisp/org/org-freemind.el (org-freemind-node-to-org): * lisp/org/ob-sql.el (org-babel-execute:sql): * lisp/org/ob-exp.el (org-babel-exp-do-export, org-babel-exp-code): * lisp/org/ob-ref.el (org-babel-ref-resolve): Fix use of case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-15 16:21:30 +0000 +++ lisp/ChangeLog 2011-03-15 17:39:56 +0000 @@ -1,3 +1,15 @@ +2011-03-15 Stefan Monnier + + * progmodes/ruby-mode.el (ruby-backward-sexp): + * progmodes/ebrowse.el (ebrowse-draw-file-member-info): + * play/gamegrid.el (gamegrid-make-face): + * play/bubbles.el (bubbles--grid-width, bubbles--grid-height) + (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images): + * notifications.el (notifications-notify): + * net/xesam.el (xesam-search-engines): + * net/quickurl.el (quickurl-list-insert): + * vc/vc-hg.el (vc-hg-dir-printer): Fix use of case. + 2011-03-15 Chong Yidong * startup.el (command-line): Update package subdirectory regexp. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-15 12:10:36 +0000 +++ lisp/gnus/ChangeLog 2011-03-15 17:39:56 +0000 @@ -1,3 +1,8 @@ +2011-03-15 Stefan Monnier + + * auth-source.el (auth-source-netrc-create): + * message.el (message-yank-original): Fix use of `case'. + 2011-03-15 Teodor Zlatanov * message.el (message-yank-original): Use cond instead of CL case. === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2011-03-15 02:44:17 +0000 +++ lisp/gnus/auth-source.el 2011-03-15 17:39:56 +0000 @@ -1130,10 +1130,10 @@ (if (zerop (length add)) "" " ") ;; remap auth-source tokens to netrc (case r - ('user "login") - ('host "machine") - ('secret "password") - ('port "port") ; redundant but clearer + (user "login") + (host "machine") + (secret "password") + (port "port") ; redundant but clearer (t (symbol-name r))) ;; the value will be printed in %S format data)))) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-03-15 12:10:36 +0000 +++ lisp/gnus/message.el 2011-03-15 17:39:56 +0000 @@ -3748,13 +3748,13 @@ (goto-char (mark t)) (insert-before-markers ?\n) (goto-char pt)))) - (cond - ((eq 'above message-cite-reply-position) + (case message-cite-reply-position + (above (message-goto-body) (insert body-text) (insert (if (bolp) "\n" "\n\n")) (message-goto-body)) - ((eq 'below message-cite-reply-position) + (below (message-goto-signature))) ;; Add a `message-setup-very-last-hook' here? ;; Add `gnus-article-highlight-citation' here? === modified file 'lisp/net/quickurl.el' --- lisp/net/quickurl.el 2011-01-25 04:08:28 +0000 +++ lisp/net/quickurl.el 2011-03-15 17:39:56 +0000 @@ -511,15 +511,15 @@ (with-current-buffer quickurl-list-last-buffer (insert (case type - ('url (funcall quickurl-format-function url)) - ('naked-url (quickurl-url-url url)) - ('with-lookup (format "%s " + (url (funcall quickurl-format-function url)) + (naked-url (quickurl-url-url url)) + (with-lookup (format "%s " (quickurl-url-keyword url) (quickurl-url-url url))) - ('with-desc (format "%S " + (with-desc (format "%S " (quickurl-url-description url) (quickurl-url-url url))) - ('lookup (quickurl-url-keyword url))))) + (lookup (quickurl-url-keyword url))))) (error "No URL details on that line")) url)) === modified file 'lisp/net/xesam.el' --- lisp/net/xesam.el 2011-02-01 21:22:21 +0000 +++ lisp/net/xesam.el 2011-03-15 17:39:56 +0000 @@ -414,18 +414,18 @@ ;; Hopefully, this will change later. (setq hit-fields (case (intern vendor-id) - ('Beagle + (Beagle '("xesam:mimeType" "xesam:url")) - ('Strigi + (Strigi '("xesam:author" "xesam:cc" "xesam:charset" "xesam:contentType" "xesam:fileExtension" "xesam:id" "xesam:lineCount" "xesam:links" "xesam:mimeType" "xesam:name" "xesam:size" "xesam:sourceModified" "xesam:subject" "xesam:to" "xesam:url")) - ('TrackerXesamSession + (TrackerXesamSession '("xesam:relevancyRating" "xesam:url")) - ('Debbugs + (Debbugs '("xesam:keyword" "xesam:owner" "xesam:title" "xesam:url" "xesam:sourceModified" "xesam:mimeType" "debbugs:key")) === modified file 'lisp/notifications.el' --- lisp/notifications.el 2011-01-25 04:08:28 +0000 +++ lisp/notifications.el 2011-03-15 17:39:56 +0000 @@ -210,8 +210,8 @@ (add-to-list 'hints `(:dict-entry "urgency" (:variant :byte ,(case urgency - ('low 0) - ('critical 2) + (low 0) + (critical 2) (t 1)))) t)) (when category (add-to-list 'hints `(:dict-entry === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-03-12 19:19:47 +0000 +++ lisp/org/ChangeLog 2011-03-15 17:39:56 +0000 @@ -1,3 +1,13 @@ +2011-03-15 Stefan Monnier + + * org-src.el (org-src-switch-to-buffer): + * org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot): + * org-mouse.el (org-mouse-agenda-type): + * org-freemind.el (org-freemind-node-to-org): + * ob-sql.el (org-babel-execute:sql): + * ob-exp.el (org-babel-exp-do-export, org-babel-exp-code): + * ob-ref.el (org-babel-ref-resolve): Fix use of case. + 2011-03-06 Juanma Barranquero * org.el (org-blank-before-new-entry, org-context-in-file-links) === modified file 'lisp/org/ob-exp.el' --- lisp/org/ob-exp.el 2011-01-25 04:08:28 +0000 +++ lisp/org/ob-exp.el 2011-03-15 17:39:56 +0000 @@ -231,10 +231,10 @@ (org-babel-exp-results info type 'silent)))) (clean () (org-babel-remove-result info))) (case (intern (or (cdr (assoc :exports (nth 2 info))) "code")) - ('none (silently) (clean) "") - ('code (silently) (clean) (org-babel-exp-code info type)) - ('results (org-babel-exp-results info type)) - ('both (concat (org-babel-exp-code info type) + (none (silently) (clean) "") + (code (silently) (clean) (org-babel-exp-code info type)) + (results (org-babel-exp-results info type)) + (both (concat (org-babel-exp-code info type) "\n\n" (org-babel-exp-results info type)))))) @@ -250,8 +250,8 @@ (name (nth 4 info)) (args (mapcar #'cdr (org-babel-get-header (nth 2 info) :var)))) (case type - ('inline (format "=%s=" body)) - ('block + (inline (format "=%s=" body)) + (block (let ((str (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body (if (and body (string-match "\n$" body)) @@ -265,7 +265,7 @@ (mapconcat #'identity args ", "))) str)) str)) - ('lob + (lob (let ((call-line (and (string-match "results=" (car args)) (substring (car args) (match-end 0))))) (cond === modified file 'lisp/org/ob-ref.el' --- lisp/org/ob-ref.el 2011-01-25 04:08:28 +0000 +++ lisp/org/ob-ref.el 2011-03-15 17:39:56 +0000 @@ -147,12 +147,12 @@ (let ((params (append args '((:results . "silent"))))) (setq result (case type - ('results-line (org-babel-read-result)) - ('table (org-babel-read-table)) - ('list (org-babel-read-list)) - ('file (org-babel-read-link)) - ('source-block (org-babel-execute-src-block nil nil params)) - ('lob (org-babel-execute-src-block nil lob-info params))))) + (results-line (org-babel-read-result)) + (table (org-babel-read-table)) + (list (org-babel-read-list)) + (file (org-babel-read-link)) + (source-block (org-babel-execute-src-block nil nil params)) + (lob (org-babel-execute-src-block nil lob-info params))))) (if (symbolp result) (format "%S" result) (if (and index (listp result)) === modified file 'lisp/org/ob-sql.el' --- lisp/org/ob-sql.el 2011-01-25 04:08:28 +0000 +++ lisp/org/ob-sql.el 2011-03-15 17:39:56 +0000 @@ -66,18 +66,18 @@ (out-file (or (cdr (assoc :out-file params)) (org-babel-temp-file "sql-out-"))) (command (case (intern engine) - ('msosql (format "osql %s -s \"\t\" -i %s -o %s" - (or cmdline "") - (org-babel-process-file-name in-file) - (org-babel-process-file-name out-file))) - ('mysql (format "mysql %s -e \"source %s\" > %s" + (msosql (format "osql %s -s \"\t\" -i %s -o %s" (or cmdline "") - (org-babel-process-file-name in-file) - (org-babel-process-file-name out-file))) - ('postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" - (org-babel-process-file-name in-file) - (org-babel-process-file-name out-file) - (or cmdline ""))) + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file))) + (mysql (format "mysql %s -e \"source %s\" > %s" + (or cmdline "") + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file))) + (postgresql (format "psql -A -P footer=off -F \"\t\" -f %s -o %s %s" + (org-babel-process-file-name in-file) + (org-babel-process-file-name out-file) + (or cmdline ""))) (t (error "no support for the %s sql engine" engine))))) (with-temp-file in-file (insert (org-babel-expand-body:sql body params))) === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2011-01-25 04:08:28 +0000 +++ lisp/org/org-freemind.el 2011-03-15 17:39:56 +0000 @@ -1172,8 +1172,8 @@ (when (< 0 (- level skip-levels)) (dolist (attrib attributes) (case (car attrib) - ('TEXT (setq text (cdr attrib))) - ('text (setq text (cdr attrib))))) + (TEXT (setq text (cdr attrib))) + (text (setq text (cdr attrib))))) (unless text ;; There should be a richcontent node holding the text: (setq text (org-freemind-get-richcontent-node-text node))) @@ -1193,7 +1193,7 @@ (setq text (replace-regexp-in-string "\n $" "" text)) (insert text)) (case qname - ('node + (node (insert (make-string (- level skip-levels) ?*) " " text "\n") (when note (insert ":COMMENT:\n" note "\n:END:\n")) === modified file 'lisp/org/org-mouse.el' --- lisp/org/org-mouse.el 2011-01-25 04:08:28 +0000 +++ lisp/org/org-mouse.el 2011-03-15 17:39:56 +0000 @@ -476,11 +476,11 @@ (defun org-mouse-agenda-type (type) (case type - ('tags "Tags: ") - ('todo "TODO: ") - ('tags-tree "Tags tree: ") - ('todo-tree "TODO tree: ") - ('occur-tree "Occur tree: ") + (tags "Tags: ") + (todo "TODO: ") + (tags-tree "Tags tree: ") + (todo-tree "TODO tree: ") + (occur-tree "Occur tree: ") (t "Agenda command ???"))) === modified file 'lisp/org/org-plot.el' --- lisp/org/org-plot.el 2011-01-25 04:08:28 +0000 +++ lisp/org/org-plot.el 2011-03-15 17:39:56 +0000 @@ -206,18 +206,18 @@ (y-labels (plist-get params :ylabels)) (plot-str "'%s' using %s%d%s with %s title '%s'") (plot-cmd (case type - ('2d "plot") - ('3d "splot") - ('grid "splot"))) + (2d "plot") + (3d "splot") + (grid "splot"))) (script "reset") plot-lines) (flet ((add-to-script (line) (setf script (format "%s\n%s" script line)))) (when file ;; output file (add-to-script (format "set term %s" (file-name-extension file))) (add-to-script (format "set output '%s'" file))) (case type ;; type - ('2d ()) - ('3d (if map (add-to-script "set map"))) - ('grid (if map + (2d ()) + (3d (if map (add-to-script "set map"))) + (grid (if map (add-to-script "set pm3d map") (add-to-script "set pm3d")))) (when title (add-to-script (format "set title '%s'" title))) ;; title @@ -243,7 +243,7 @@ "%Y-%m-%d-%H:%M:%S") "\""))) (unless preface (case type ;; plot command - ('2d (dotimes (col num-cols) + (2d (dotimes (col num-cols) (unless (and (equal type '2d) (or (and ind (equal (+ 1 col) ind)) (and deps (not (member (+ 1 col) deps))))) @@ -258,10 +258,10 @@ with (or (nth col col-labels) (format "%d" (+ 1 col)))) plot-lines))))) - ('3d + (3d (setq plot-lines (list (format "'%s' matrix with %s title ''" data-file with)))) - ('grid + (grid (setq plot-lines (list (format "'%s' with %s title ''" data-file with))))) (add-to-script @@ -305,9 +305,9 @@ (setf params (org-plot/collect-options params)))) ;; dump table to datafile (very different for grid) (case (plist-get params :plot-type) - ('2d (org-plot/gnuplot-to-data table data-file params)) - ('3d (org-plot/gnuplot-to-data table data-file params)) - ('grid (let ((y-labels (org-plot/gnuplot-to-grid-data + (2d (org-plot/gnuplot-to-data table data-file params)) + (3d (org-plot/gnuplot-to-data table data-file params)) + (grid (let ((y-labels (org-plot/gnuplot-to-grid-data table data-file params))) (when y-labels (plist-put params :ylabels y-labels))))) ;; check for timestamp ind column === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2011-02-10 16:56:00 +0000 +++ lisp/org/org-src.el 2011-03-15 17:39:56 +0000 @@ -335,26 +335,26 @@ (defun org-src-switch-to-buffer (buffer context) (case org-src-window-setup - ('current-window + (current-window (switch-to-buffer buffer)) - ('other-window + (other-window (switch-to-buffer-other-window buffer)) - ('other-frame + (other-frame (case context - ('exit + (exit (let ((frame (selected-frame))) (switch-to-buffer-other-frame buffer) (delete-frame frame))) - ('save + (save (kill-buffer (current-buffer)) (switch-to-buffer buffer)) (t (switch-to-buffer-other-frame buffer)))) - ('reorganize-frame + (reorganize-frame (if (eq context 'edit) (delete-other-windows)) (org-switch-to-buffer-other-window buffer) (if (eq context 'exit) (delete-other-windows))) - ('switch-invisibly + (switch-invisibly (set-buffer buffer)) (t (message "Invalid value %s for org-src-window-setup" === modified file 'lisp/play/bubbles.el' --- lisp/play/bubbles.el 2011-01-25 04:08:28 +0000 +++ lisp/play/bubbles.el 2011-03-15 17:39:56 +0000 @@ -719,57 +719,57 @@ (defsubst bubbles--grid-width () "Return the grid width for the current game theme." (car (case bubbles-game-theme - ('easy + (easy bubbles--grid-small) - ('medium + (medium bubbles--grid-medium) - ('difficult + (difficult bubbles--grid-large) - ('hard + (hard bubbles--grid-huge) - ('user-defined + (user-defined bubbles-grid-size)))) (defsubst bubbles--grid-height () "Return the grid height for the current game theme." (cdr (case bubbles-game-theme - ('easy + (easy bubbles--grid-small) - ('medium + (medium bubbles--grid-medium) - ('difficult + (difficult bubbles--grid-large) - ('hard + (hard bubbles--grid-huge) - ('user-defined + (user-defined bubbles-grid-size)))) (defsubst bubbles--colors () "Return the color list for the current game theme." (case bubbles-game-theme - ('easy + (easy bubbles--colors-2) - ('medium + (medium bubbles--colors-3) - ('difficult + (difficult bubbles--colors-4) - ('hard + (hard bubbles--colors-5) - ('user-defined + (user-defined bubbles-colors))) (defsubst bubbles--shift-mode () "Return the shift mode for the current game theme." (case bubbles-game-theme - ('easy - 'default) - ('medium - 'default) - ('difficult - 'always) - ('hard - 'always) - ('user-defined + (easy + 'default) + (medium + 'default) + (difficult + 'always) + (hard + 'always) + (user-defined bubbles-shift-mode))) (defun bubbles-save-settings () @@ -1346,11 +1346,11 @@ (when (and (display-images-p) (not (eq bubbles-graphics-theme 'ascii))) (let ((template (case bubbles-graphics-theme - ('circles bubbles--image-template-circle) - ('balls bubbles--image-template-ball) - ('squares bubbles--image-template-square) - ('diamonds bubbles--image-template-diamond) - ('emacs bubbles--image-template-emacs)))) + (circles bubbles--image-template-circle) + (balls bubbles--image-template-ball) + (squares bubbles--image-template-square) + (diamonds bubbles--image-template-diamond) + (emacs bubbles--image-template-emacs)))) (setq bubbles--empty-image (create-image (replace-regexp-in-string "^\"\\(.*\\)\t.*c .*\",$" === modified file 'lisp/play/gamegrid.el' --- lisp/play/gamegrid.el 2011-01-25 04:08:28 +0000 +++ lisp/play/gamegrid.el 2011-03-15 17:39:56 +0000 @@ -213,19 +213,19 @@ (let ((data (gamegrid-match-spec-list data-spec-list)) (color (gamegrid-match-spec-list color-spec-list))) (case data - ('color-x + (color-x (gamegrid-make-color-x-face color)) - ('grid-x + (grid-x (unless gamegrid-grid-x-face (setq gamegrid-grid-x-face (gamegrid-make-grid-x-face))) gamegrid-grid-x-face) - ('mono-x + (mono-x (unless gamegrid-mono-x-face (setq gamegrid-mono-x-face (gamegrid-make-mono-x-face))) gamegrid-mono-x-face) - ('color-tty + (color-tty (gamegrid-make-color-tty-face color)) - ('mono-tty + (mono-tty (unless gamegrid-mono-tty-face (setq gamegrid-mono-tty-face (gamegrid-make-mono-tty-face))) gamegrid-mono-tty-face)))) === modified file 'lisp/progmodes/ebrowse.el' --- lisp/progmodes/ebrowse.el 2011-01-26 08:36:39 +0000 +++ lisp/progmodes/ebrowse.el 2011-03-15 17:39:56 +0000 @@ -3566,12 +3566,12 @@ (insert kind) (indent-to 50) (insert (case (second info) - ('ebrowse-ts-member-functions "member function") - ('ebrowse-ts-member-variables "member variable") - ('ebrowse-ts-static-functions "static function") - ('ebrowse-ts-static-variables "static variable") - ('ebrowse-ts-friends (if globals-p "define" "friend")) - ('ebrowse-ts-types "type") + (ebrowse-ts-member-functions "member function") + (ebrowse-ts-member-variables "member variable") + (ebrowse-ts-static-functions "static function") + (ebrowse-ts-static-variables "static variable") + (ebrowse-ts-friends (if globals-p "define" "friend")) + (ebrowse-ts-types "type") (t "unknown")) "\n"))) === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2011-01-27 17:07:48 +0000 +++ lisp/progmodes/ruby-mode.el 2011-03-15 17:39:56 +0000 @@ -974,7 +974,7 @@ (goto-char (scan-sexps (1+ (point)) -1)) (case (char-before) (?% (forward-char -1)) - ('(?q ?Q ?w ?W ?r ?x) + ((?q ?Q ?w ?W ?r ?x) (if (eq (char-before (1- (point))) ?%) (forward-char -2)))) nil) ((looking-at "\\s\"\\|\\\\\\S_") === modified file 'lisp/vc/vc-dir.el' --- lisp/vc/vc-dir.el 2011-03-05 21:56:00 +0000 +++ lisp/vc/vc-dir.el 2011-03-15 17:39:56 +0000 @@ -104,7 +104,7 @@ ;; We pass a filename to create-file-buffer because it is what ;; the function expects, and also what uniquify needs (if active) (with-current-buffer (create-file-buffer (expand-file-name bname dir)) - (cd dir) + (setq default-directory dir) (vc-setup-buffer (current-buffer)) ;; Reset the vc-parent-buffer-name so that it does not appear ;; in the mode-line. @@ -1002,7 +1002,7 @@ (generate-new-buffer (format " *VC-%s* tmp status" backend)))) (lexical-let ((buffer (current-buffer))) (with-current-buffer vc-dir-process-buffer - (cd def-dir) + (setq default-directory def-dir) (erase-buffer) (vc-call-backend backend 'dir-status-files def-dir files default-state @@ -1067,7 +1067,7 @@ (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "") (lexical-let ((buffer (current-buffer))) (with-current-buffer vc-dir-process-buffer - (cd def-dir) + (setq default-directory def-dir) (erase-buffer) (vc-call-backend backend 'dir-status def-dir === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2011-03-10 08:32:27 +0000 +++ lisp/vc/vc-hg.el 2011-03-15 17:39:56 +0000 @@ -529,9 +529,9 @@ (insert (propertize (format " (%s %s)" (case (vc-hg-extra-fileinfo->rename-state extra) - ('copied "copied from") - ('renamed-from "renamed from") - ('renamed-to "renamed to")) + (copied "copied from") + (renamed-from "renamed from") + (renamed-to "renamed to")) (vc-hg-extra-fileinfo->extra-name extra)) 'face 'font-lock-comment-face))))) ------------------------------------------------------------ revno: 103661 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-03-15 12:21:30 -0400 message: * lisp/startup.el (command-line): Update package subdirectory regexp. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-15 02:46:18 +0000 +++ lisp/ChangeLog 2011-03-15 16:21:30 +0000 @@ -1,3 +1,7 @@ +2011-03-15 Chong Yidong + + * startup.el (command-line): Update package subdirectory regexp. + 2011-03-15 Stefan Monnier * allout.el (allout-abbreviate-flattened-numbering) === modified file 'lisp/startup.el' --- lisp/startup.el 2011-01-25 04:08:28 +0000 +++ lisp/startup.el 2011-03-15 16:21:30 +0000 @@ -1191,7 +1191,7 @@ (dolist (subdir (directory-files dir)) (when (and (file-directory-p (expand-file-name subdir dir)) ;; package-subdirectory-regexp from package.el - (string-match "^\\([^.].*\\)-\\([0-9]+\\(?:[.][0-9]+\\)*\\)$" + (string-match "\\`\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)\\'" subdir)) (throw 'package-dir-found t))))))) (package-initialize)) ------------------------------------------------------------ revno: 103660 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-03-15 12:10:36 +0000 message: message.el (message-yank-original): Use cond instead of CL case. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-03-15 02:44:17 +0000 +++ lisp/gnus/ChangeLog 2011-03-15 12:10:36 +0000 @@ -1,3 +1,7 @@ +2011-03-15 Teodor Zlatanov + + * message.el (message-yank-original): Use cond instead of CL case. + 2011-03-15 Stefan Monnier * auth-source.el (auth-source-netrc-create): Use usual format for the === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-03-05 13:01:56 +0000 +++ lisp/gnus/message.el 2011-03-15 12:10:36 +0000 @@ -3748,13 +3748,13 @@ (goto-char (mark t)) (insert-before-markers ?\n) (goto-char pt)))) - (case message-cite-reply-position - ('above + (cond + ((eq 'above message-cite-reply-position) (message-goto-body) (insert body-text) (insert (if (bolp) "\n" "\n\n")) (message-goto-body)) - ('below + ((eq 'below message-cite-reply-position) (message-goto-signature))) ;; Add a `message-setup-very-last-hook' here? ;; Add `gnus-article-highlight-citation' here? ------------------------------------------------------------ revno: 103659 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-03-14 22:46:18 -0400 message: * lisp/allout.el (allout-abbreviate-flattened-numbering) (allout-mode-deactivate-hook): Fix up obsolescence "date". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-15 02:42:31 +0000 +++ lisp/ChangeLog 2011-03-15 02:46:18 +0000 @@ -1,5 +1,8 @@ 2011-03-15 Stefan Monnier + * allout.el (allout-abbreviate-flattened-numbering) + (allout-mode-deactivate-hook): Fix up obsolescence "date". + * subr.el (read-char-choice): Only show the cursor after the prompt, not after the answer. === modified file 'lisp/allout.el' --- lisp/allout.el 2011-03-09 20:48:56 +0000 +++ lisp/allout.el 2011-03-15 02:46:18 +0000 @@ -310,6 +310,7 @@ With value nil, inhibit any automatic allout-mode activation." :set 'allout-auto-activation-helper + ;; FIXME: Using strings here is unusual and less efficient than symbols. :type '(choice (const :tag "On" t) (const :tag "Ask about layout" "ask") (const :tag "Mode only" "activate") @@ -752,7 +753,7 @@ ;;;_ = allout-flattened-numbering-abbreviation (define-obsolete-variable-alias 'allout-abbreviate-flattened-numbering - 'allout-flattened-numbering-abbreviation "24.0") + 'allout-flattened-numbering-abbreviation "24.1") (defcustom allout-flattened-numbering-abbreviation nil "If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic numbers to minimal amount with some context. Otherwise, entire @@ -1402,7 +1403,7 @@ (defvar allout-mode-deactivate-hook nil "*Hook that's run when allout mode ends.") (define-obsolete-variable-alias 'allout-mode-deactivate-hook - 'allout-mode-off-hook "future") + 'allout-mode-off-hook "24.1") ;;;_ = allout-exposure-category (defvar allout-exposure-category nil "Symbol for use as allout invisible-text overlay category.")