Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103401. ------------------------------------------------------------ revno: 103401 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 23:27:09 -0800 message: Fix some mis-spellings of "precede" that are not in emacs-23 branch. diff: === modified file 'lisp/allout-widgets.el' --- lisp/allout-widgets.el 2011-02-17 21:47:18 +0000 +++ lisp/allout-widgets.el 2011-02-23 07:27:09 +0000 @@ -2013,7 +2013,7 @@ ;; item body), to bias the registered values. ;; ;; This is not necessary/useful when the item is being decorated, because - ;; that always must be preceeded by a fresh item parse. + ;; that always must be preceded by a fresh item parse. (if (not (eq field :body-end)) (widget-get item-widget :from) === modified file 'lisp/allout.el' --- lisp/allout.el 2011-02-17 22:57:38 +0000 +++ lisp/allout.el 2011-02-23 07:27:09 +0000 @@ -255,7 +255,7 @@ This is in contrast to the majority of allout-mode bindings on `allout-prefixed-bindings', whose bindings are created with a -preceeding command key. +preceding command key. Use vector format for the keys: - put literal keys after a '?' question mark, eg: '?a', '?.' === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2011-01-25 04:08:28 +0000 +++ lisp/progmodes/sql.el 2011-02-23 07:27:09 +0000 @@ -2801,7 +2801,7 @@ (defun sql-rename-buffer (&optional new-name) "Rename a SQL interactive buffer. -Prompts for the new name if command is preceeded by +Prompts for the new name if command is preceded by \\[universal-argument]. If no buffer name is provided, then the `sql-alternate-buffer-name' is used. @@ -3262,7 +3262,7 @@ :abbrev-table sql-mode-abbrev-table (if sql-mode-menu (easy-menu-add sql-mode-menu)); XEmacs - + (set (make-local-variable 'comment-start) "--") ;; Make each buffer in sql-mode remember the "current" SQLi buffer. (make-local-variable 'sql-buffer) @@ -4257,4 +4257,3 @@ (provide 'sql) ;;; sql.el ends here - === modified file 'src/bidi.c' --- src/bidi.c 2011-01-25 04:08:28 +0000 +++ src/bidi.c 2011-02-23 07:27:09 +0000 @@ -1520,7 +1520,7 @@ bidi_check_type (bidi_it->type); /* For L1 below, we need to know, for each WS character, whether - it belongs to a sequence of WS characters preceeding a newline + it belongs to a sequence of WS characters preceding a newline or a TAB or a paragraph separator. */ if (bidi_it->orig_type == NEUTRAL_WS && bidi_it->next_for_ws.type == UNKNOWN_BT) ------------------------------------------------------------ revno: 103400 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:47:11 -0800 message: * etc/NEWS: Typo fixes. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-02-23 04:37:53 +0000 +++ etc/NEWS 2011-02-23 04:47:11 +0000 @@ -330,7 +330,7 @@ ** The Landmark game is now invoked with `landmark', not `lm'. ** Prolog mode has been completely revamped, with lots of additional -functionality such as more intelligent indentation, electricty, support for +functionality such as more intelligent indentation, electricity, support for more variants, including Mercury, and a lot more. ** shell-mode can track your cwd by reading it from your prompt. @@ -532,7 +532,7 @@ **** List all objects. Using `M-x sql-list-all', `C-c C-l a' or selecting "SQL->List all objects" will list all the objects in the database. At a minimum it -lists the tables and views in the database. Preceeding the command by +lists the tables and views in the database. Preceding the command by universal argument may provide additional details or extend the listing to include other schemas objects. The list will appear in a separate window in view-mode. @@ -540,7 +540,7 @@ **** List Table details. Using `M-x sql-list-table', `C-c C-l t' or selecting "SQL->List Table details" will ask for the name of a database table or view and display -the list of columns in the relation. Preceeding the comand with the +the list of columns in the relation. Preceding the command with the universal argument may provide additional details about each column. The list will appear in a separate window in view-mode. @@ -555,7 +555,7 @@ SQL interactive mode and this option used in its place. *** SQL interactive mode will replace tabs with spaces. -This prevents the comand interpretter for MySQL and Postgres from +This prevents the command interpreter for MySQL and Postgres from listing object name completions when being sent text via `sql-send-*' functions. @@ -564,7 +564,7 @@ ** sregex.el is now obsolete, since rx.el is a strict superset. ** s-region.el and pc-select are now declared obsolete, -superceded by shift-select-mode enabled by default in 23.1. +superseded by shift-select-mode enabled by default in 23.1. ** pc-mode.el is also declared obsolete. ** gdb-mi @@ -802,10 +802,9 @@ runtime checks. ** New configure.bat option --distfiles to specify files to be - included in binary distribution +included in binary distribution -** New make target `dist' to create binary disttribution for Windows - platform +** New make target `dist' to create binary distribution for MS Windows ---------------------------------------------------------------------- ------------------------------------------------------------ revno: 103399 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:37:53 -0800 message: * etc/NEWS: Remove some sql-stuff that is not NEWS-worthy. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-02-23 03:44:13 +0000 +++ etc/NEWS 2011-02-23 04:37:53 +0000 @@ -424,10 +424,6 @@ ** SQL Mode enhancements. -*** Several variables have been marked as safe local variables. The -variables `sql-product', `sql-user', `sql-server', `sql-database' and -`sql-port' can now be safely used as local variables. - *** `sql-dialect' is a synonym for `sql-product'. *** Added ability to login with a port on MySQL and Postgres. ------------------------------------------------------------ revno: 103398 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:27:42 -0800 message: Comment spelling fix. diff: === modified file 'lisp/mail/mailheader.el' --- lisp/mail/mailheader.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/mailheader.el 2011-02-23 04:27:42 +0000 @@ -101,7 +101,7 @@ (cons (cdr header) (funcall (cdr rule) (cdr header)))))))) headers) -;; Advertized part of the interface; see mail-header, mail-header-set. +;; Advertised part of the interface; see mail-header, mail-header-set. (defvar headers) (defsubst mail-header (header &optional header-alist) ------------------------------------------------------------ revno: 103397 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:24:13 -0800 message: * admin/notes/bzr: More details about merging ChangeLogs. diff: === modified file 'admin/notes/bzr' --- admin/notes/bzr 2011-02-23 03:50:04 +0000 +++ admin/notes/bzr 2011-02-23 04:24:13 +0000 @@ -117,7 +117,10 @@ bzrmerge tries to fix up the dates to today's date, but it only does this where there are conflicts. If you used the changelog_merge plugin, there won't be any conflicts, and (at time of writing) you will need -to adjust dates by hand. +to adjust dates by hand. In any case, if someone made multiple +ChangeLog entries on different days in the branch, you may wish to +collapse them all to a single entry for that author in the trunk +(because in the trunk they all appear under the same date). Notes: ------------------------------------------------------------ revno: 103396 [merge] committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:19:28 -0800 message: Merge from emacs-23; up to r100498. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-02-20 08:48:52 +0000 +++ admin/ChangeLog 2011-02-23 04:19:28 +0000 @@ -1,3 +1,7 @@ +2011-02-23 Juanma Barranquero + + * notes/bugtracker (bugtracker_debbugs_url): Fix typo. + 2011-02-19 Eli Zaretskii * admin.el (set-version): Add msdos/sed2v2.inp. === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2011-02-09 03:27:57 +0000 +++ admin/notes/bugtracker 2011-02-23 04:19:28 +0000 @@ -489,7 +489,7 @@ by the bug number you specify after `--fixes debbugs:' in the bzr command line (123 in the example above). -In the bazaar.conf file, this setting should go into the [DEFAULTS] +In the bazaar.conf file, this setting should go into the [DEFAULT] section. In the locations.conf file, it should go into the branch-specific === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-23 03:44:13 +0000 +++ doc/misc/ChangeLog 2011-02-23 04:19:28 +0000 @@ -1,5 +1,18 @@ +2011-02-23 Michael Albinus + + * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and + "Debian GNU/Linux". + + * trampver.texi [xemacs]: Set emacsothername to "Emacs". + 2011-02-23 Glenn Morris + * dired-x.texi (Features): Minor rephrasing. + (Local Variables): Fix typos. + + * edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi: + Standardize some Emacs/XEmacs terminology. + * dired-x.texi (Features): Don't advertise obsolete local variables. Simplify layout. (Omitting Variables): Update local variables example. === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-23 03:44:13 +0000 +++ doc/misc/dired-x.texi 2011-02-23 04:19:28 +0000 @@ -152,10 +152,10 @@ @noindent @file{dired-x.el} binds some functions to keys in Dired Mode (@pxref{Key Index}) and also binds @kbd{C-x C-j} and @kbd{C-x 4 C-j} @emph{globally} to -@code{dired-jump} (@pxref{Miscellaneous Commands}). It may also bind @kbd{C-x -C-f} and @kbd{C-x 4 C-f} to @code{dired-x-find-file} and -@code{dired-x-find-file-other-window}, respectively (@pxref{Find File At -Point}). +@code{dired-jump} (@pxref{Miscellaneous Commands}). Optionally, it +also binds @kbd{C-x C-f} and @kbd{C-x 4 C-f} to +@code{dired-x-find-file} and @code{dired-x-find-file-other-window}, +respectively (@pxref{Find File At Point}). @node Technical Details, , Features, Introduction @section Technical Details @@ -514,7 +514,7 @@ @noindent You can set @code{dired-local-variables-file} to @code{nil} to suppress this. The value of @code{dired-enable-local-variables} controls if and how these -local variables are read. This variable exists so that if may override the +local variables are read. This variable exists so that it may override the default value of @code{enable-local-variables}. @noindent === modified file 'doc/misc/edt.texi' --- doc/misc/edt.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/edt.texi 2011-02-23 04:19:28 +0000 @@ -87,7 +87,7 @@ active''. You can have the EDT Emulation start up automatically, each time you -initiate a GNU Emacs session, by adding the following line to your +initiate an Emacs session, by adding the following line to your @file{.emacs} file: @example @@ -218,7 +218,7 @@ @item Emulate EDT Keypad Mode commands closely so that current EDT users will -find that it easy and comfortable to use GNU Emacs with a small learning +find that it easy and comfortable to use Emacs with a small learning curve. @item @@ -237,7 +237,7 @@ just as they existed before the EDT emulation was first invoked. @item -Support GNU Emacs 19 and higher. XEmacs 19, and above, is also supported. +Support Emacs and XEmacs 19 and higher. @item Supports highlighting of marked text within the EDT emulation on all @@ -285,13 +285,13 @@ @node Starting emulation @chapter How to Get Started -Start up GNU Emacs and enter @kbd{M-x edt-emulation-on} to begin the +Start up Emacs and enter @kbd{M-x edt-emulation-on} to begin the emulation. After initialization is complete, the following message will appear below the status line informing you that the emulation has been enabled: ``Default EDT keymap active''. You can have the EDT Emulation start up automatically, each time you -initiate a GNU Emacs session, by adding the following line to your +initiate an Emacs session, by adding the following line to your @file{.emacs} file: @example @@ -306,7 +306,7 @@ It is easy to customize key bindings in the EDT Emulation (@pxref{Customizing}). Customizations are placed in a file called @file{edt-user.el}. The Emacs @file{etc/} directory contains an -example. If @file{edt-user.el} is found in your GNU Emacs load path +example. If @file{edt-user.el} is found in your Emacs load path during EDT Emulation initialization, then the following message will appear below the status line indicating that the emulation has been enabled, enhanced by your own customizations: ``User EDT custom keymap @@ -321,8 +321,8 @@ emulation. Emacs binds keys to @acronym{ASCII} control characters and so does the -real EDT. Where EDT key bindings and GNU Emacs key bindings conflict, -the default GNU Emacs key bindings are retained by the EDT emulation by +real EDT. Where EDT key bindings and Emacs key bindings conflict, +the default Emacs key bindings are retained by the EDT emulation by default. If you are a diehard EDT user you may not like this. The @ref{Control keys} section explains how to change this so that the EDT bindings to @acronym{ASCII} control characters override the default @@ -364,7 +364,7 @@ @example ! File: .xmodmaprc ! -! Set up Sun Type 5 keypad for use with the GNU Emacs EDT Emulation +! Set up Sun Type 5 keypad for use with the Emacs EDT Emulation ! keycode 53 = KP_Divide keycode 54 = KP_Multiply @@ -436,7 +436,7 @@ @example ! File: .xmodmaprc ! -! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation +! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation ! clear mod2 keycode 77 = F12 @@ -518,7 +518,7 @@ @example ! File: .xmodmaprc ! -! Set up PC keypad under GNU/Linux for the GNU Emacs EDT Emulation +! Set up PC keypad under GNU/Linux for the Emacs EDT Emulation ! clear mod2 keycode 77 = F12 @@ -541,7 +541,7 @@ but not all, of EDT's most used Keypad Mode editing functions and behavior. It is not perfect, but most EDT users who have tried the emulation agree that it is quite good enough to make it easy for -die-hard EDT users to move over to using GNU Emacs. +die-hard EDT users to move over to using Emacs. Here's a list of the most important differences between EDT and this GNU Emacs EDT Emulation. The list is short but you must be aware of these @@ -783,7 +783,7 @@ @end ignore First, you need to have your own private lisp directory, say -@file{~/lisp}, and you should add it to the GNU Emacs load path. +@file{~/lisp}, and you should add it to the Emacs load path. @strong{Please note:} A few sites have different load-path requirements, so the above directions may need some modification if your site has such @@ -898,8 +898,8 @@ @node Control keys @section Enabling EDT Control Key Sequence Bindings -Where EDT key bindings and GNU Emacs key bindings conflict, the default -GNU Emacs key bindings are retained by default. Some diehard EDT users +Where EDT key bindings and Emacs key bindings conflict, the default +Emacs key bindings are retained by default. Some diehard EDT users may not like this. So, if the variable @code{edt-use-EDT-control-key-bindings} is set to true in a user's @file{.emacs} file, then the default EDT Emulation mode will enable most === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/erc.texi 2011-02-23 04:19:28 +0000 @@ -36,7 +36,7 @@ @titlepage @title ERC manual @subtitle a full-featured IRC client -@subtitle for GNU Emacs and XEmacs +@subtitle for Emacs and XEmacs @c The following two commands @c start the copyright page. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-02-22 13:31:15 +0000 +++ doc/misc/gnus.texi 2011-02-23 04:19:28 +0000 @@ -22498,7 +22498,7 @@ return a string. When the mouse passes over text with this property set, a balloon window will appear and display the string. Please refer to @ref{Tooltips, ,Tooltips, emacs, The Emacs Manual}, -(in GNU Emacs) or the doc string of @code{balloon-help-mode} (in +(in Emacs) or the doc string of @code{balloon-help-mode} (in XEmacs) for more information on this. (For technical reasons, the guillemets have been approximated as @samp{<<} and @samp{>>} in this paragraph.) @@ -27766,7 +27766,7 @@ the second parameter. @file{make.bat} has been rewritten from scratch, it now features -automatic recognition of XEmacs and GNU Emacs, generates +automatic recognition of XEmacs and Emacs, generates @file{gnus-load.el}, checks if errors occur while compilation and generation of info files and reports them at the end of the build process. It now uses @code{makeinfo} if it is available and falls === modified file 'doc/misc/idlwave.texi' --- doc/misc/idlwave.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/idlwave.texi 2011-02-23 04:19:28 +0000 @@ -4275,7 +4275,7 @@ under XEmacs.} You don't have the @samp{browse-url} (or other required) XEmacs package. -Unlike GNU Emacs, XEmacs distributes many packages separately from the +Unlike Emacs, XEmacs distributes many packages separately from the main program. IDLWAVE is actually among these, but is not always the most up to date. When installing IDLWAVE as an XEmacs package, it should prompt you for required additional packages. When installing it === modified file 'doc/misc/mh-e.texi' --- doc/misc/mh-e.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/mh-e.texi 2011-02-23 04:19:28 +0000 @@ -211,9 +211,9 @@ more niceties about GNU Emacs and MH@. Now I'm fully hooked on both of them. -The MH-E package is distributed with GNU Emacs@footnote{Version -@value{VERSION} of MH-E appeared in GNU Emacs 23.1. It is supported -in GNU Emacs 21 and 22, as well as XEmacs 21 (except for versions +The MH-E package is distributed with Emacs@footnote{Version +@value{VERSION} of MH-E appeared in Emacs 23.1. It is supported +in Emacs 21 and 22, as well as XEmacs 21 (except for versions 21.5.9-21.5.16). It is compatible with MH versions 6.8.4 and higher, all versions of nmh, and GNU mailutils 1.0 and higher.}, so you shouldn't have to do anything special to use it. Gnus is also === modified file 'doc/misc/tramp.texi' --- doc/misc/tramp.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/tramp.texi 2011-02-23 04:19:28 +0000 @@ -369,13 +369,12 @@ @cindex obtaining Tramp @value{tramp} is freely available on the Internet and the latest -release may be downloaded from -@uref{ftp://ftp.gnu.org/gnu/tramp/}. This release includes the full -documentation and code for @value{tramp}, suitable for installation. -But GNU Emacs (22 or later) includes @value{tramp} already, and there -is a @value{tramp} package for XEmacs, as well. So maybe it is easier -to just use those. But if you want the bleeding edge, read -on@dots{...} +release may be downloaded from @uref{ftp://ftp.gnu.org/gnu/tramp/}. +This release includes the full documentation and code for +@value{tramp}, suitable for installation. But Emacs (22 or later) +includes @value{tramp} already, and there is a @value{tramp} package +for XEmacs, as well. So maybe it is easier to just use those. But if +you want the bleeding edge, read on@dots{...} For the especially brave, @value{tramp} is available from CVS. The CVS version is the latest version of the code and may contain incomplete @@ -445,10 +444,10 @@ @end ifset In December 2001, @value{tramp} has been added to the XEmacs package -repository. Being part of the GNU Emacs repository happened in June -2002, the first release including @value{tramp} was GNU Emacs 22.1. +repository. Being part of the Emacs repository happened in June 2002, +the first release including @value{tramp} was Emacs 22.1. -@value{tramp} is also a GNU/Linux Debian package since February 2001. +@value{tramp} is also a Debian GNU/Linux package since February 2001. @c Installation chapter is necessary only in case of standalone @@ -1704,9 +1703,10 @@ machines. The symbol @code{tramp-default-remote-path} is a place holder, it is replaced by the list of directories received via the command @command{getconf PATH} on your remote machine. For example, -on GNU Debian this is @file{/bin:/usr/bin}, whereas on Solaris this is -@file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}. It is -recommended to apply this symbol on top of @code{tramp-remote-path}. +on Debian GNU/Linux this is @file{/bin:/usr/bin}, whereas on Solaris +this is @file{/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/opt/SUNWspro/bin}. +It is recommended to apply this symbol on top of +@code{tramp-remote-path}. It is possible, however, that your local (or remote ;) system administrator has put the tools you want in some obscure local @@ -2740,8 +2740,8 @@ @item Which systems does it work on? -The package has been used successfully on GNU Emacs 22, GNU Emacs 23, -XEmacs 21 (starting with 21.4), and SXEmacs 22. +The package has been used successfully on Emacs 22, Emacs 23, XEmacs +21 (starting with 21.4), and SXEmacs 22. The package was intended to work on Unix, and it really expects a Unix-like system on the remote end (except the @option{smb} method), @@ -3583,9 +3583,9 @@ But I have decided that this is too fragile to reliably work, so on some systems you'll have to do without the uuencode methods. -@item The @value{tramp} filename syntax differs between GNU Emacs and XEmacs. +@item The @value{tramp} filename syntax differs between Emacs and XEmacs. -The GNU Emacs maintainers wish to use a unified filename syntax for +The Emacs maintainers wish to use a unified filename syntax for Ange-FTP and @value{tramp} so that users don't have to learn a new syntax. It is sufficient to learn some extensions to the old syntax. === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2011-02-19 19:40:59 +0000 +++ doc/misc/trampver.texi 2011-02-23 04:19:28 +0000 @@ -63,7 +63,7 @@ @set postfixhop / @set ipv6prefix @set ipv6postfix -@set emacsothername GNU Emacs +@set emacsothername Emacs @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html @end ifset === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-23 03:44:13 +0000 +++ lisp/ChangeLog 2011-02-23 04:19:28 +0000 @@ -1,3 +1,11 @@ +2011-02-23 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an + error when a multipart boundary in the nested multipart is found. + + * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of + header components. + 2011-02-23 Glenn Morris * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-02-20 11:59:44 +0000 +++ lisp/mail/rmail.el 2011-02-23 04:19:28 +0000 @@ -3443,6 +3443,16 @@ (setq yank-action (list 'insert-buffer replybuffer))) (push (cons "cc" cc) other-headers) (push (cons "in-reply-to" in-reply-to) other-headers) + (setq other-headers + (mapcar #'(lambda (elt) + (cons (car elt) (if (stringp (cdr elt)) + (rfc2047-decode-string (cdr elt))))) + other-headers)) + (if (stringp to) (setq to (rfc2047-decode-string to))) + (if (stringp in-reply-to) + (setq in-reply-to (rfc2047-decode-string in-reply-to))) + (if (stringp cc) (setq cc (rfc2047-decode-string cc))) + (if (stringp subject) (setq subject (rfc2047-decode-string subject))) (prog1 (compose-mail to subject other-headers noerase switch-function yank-action sendactions @@ -3450,7 +3460,7 @@ (if (eq switch-function 'switch-to-buffer-other-frame) ;; This is not a standard frame parameter; nothing except ;; sendmail.el looks at it. - (modify-frame-parameters (selected-frame) + (modify-frame-parameters (selected-frame) '((mail-dedicated-frame . t))))))) (defun rmail-mail-return () === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2011-02-19 19:40:59 +0000 +++ lisp/mail/rmailmm.el 2011-02-23 04:19:28 +0000 @@ -853,28 +853,33 @@ ((looking-at "[ \t]*\n") (setq next (copy-marker (match-end 0) t))) (t - (rmail-mm-get-boundary-error-message - "Malformed boundary" content-type content-disposition - content-transfer-encoding))) - - (setq index (1+ index)) - ;; Handle the part. - (if parse-tag + ;; The original code signalled an error as below, but + ;; this line may be a boundary of nested multipart. So, + ;; we just set `next' to nil to skip this line + ;; (rmail-mm-get-boundary-error-message + ;; "Malformed boundary" content-type content-disposition + ;; content-transfer-encoding) + (setq next nil))) + + (when next + (setq index (1+ index)) + ;; Handle the part. + (if parse-tag + (save-restriction + (narrow-to-region beg end) + (let ((child (rmail-mime-process + nil (format "%s/%d" parse-tag index) + content-type content-disposition))) + ;; Display a tagline. + (aset (aref (rmail-mime-entity-display child) 1) 1 + (aset (rmail-mime-entity-tagline child) 2 t)) + (push child entities))) + + (delete-region end next) (save-restriction (narrow-to-region beg end) - (let ((child (rmail-mime-process - nil (format "%s/%d" parse-tag index) - content-type content-disposition))) - ;; Display a tagline. - (aset (aref (rmail-mime-entity-display child) 1) 1 - (aset (rmail-mime-entity-tagline child) 2 t)) - (push child entities))) - - (delete-region end next) - (save-restriction - (narrow-to-region beg end) - (rmail-mime-show))) - (goto-char (setq beg next))) + (rmail-mime-show))) + (goto-char (setq beg next)))) (when parse-tag (setq entities (nreverse entities)) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-22 18:32:51 +0000 +++ src/ChangeLog 2011-02-23 04:19:28 +0000 @@ -1,3 +1,8 @@ +2011-02-23 Kenichi Handa + + * font.c (font_open_entity): Be sure to set scaled_pixel_size. + (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer. + 2011-02-22 Paul Eggert * dired.c (Ffile_attributes): Simplify and avoid #ifdef. === modified file 'src/font.c' --- src/font.c 2011-02-16 15:02:50 +0000 +++ src/font.c 2011-02-23 04:19:28 +0000 @@ -2806,7 +2806,7 @@ Lisp_Object objlist, size, val, font_object; struct font *font; int min_width, height; - int scaled_pixel_size; + int scaled_pixel_size = pixel_size; font_assert (FONT_ENTITY_P (entity)); size = AREF (entity, FONT_SIZE_INDEX); @@ -3121,7 +3121,7 @@ XSETFRAME (frame, f); size = AREF (spec, FONT_SIZE_INDEX); pixel_size = font_pixel_size (f, spec); - if (pixel_size == 0) + if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX])) { double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); ------------------------------------------------------------ revno: 103395 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 20:00:52 -0800 message: Remove pointless setting of byte-compile-dynamic in tiny, tiny file. diff: === modified file 'lisp/mail/mailclient.el' --- lisp/mail/mailclient.el 2011-01-25 04:08:28 +0000 +++ lisp/mail/mailclient.el 2011-02-23 04:00:52 +0000 @@ -1,4 +1,4 @@ -;;; mailclient.el --- mail sending via system's mail client. -*- byte-compile-dynamic: t -*- +;;; mailclient.el --- mail sending via system's mail client. ;; Copyright (C) 2005-2011 Free Software Foundation ------------------------------------------------------------ revno: 103394 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 19:50:04 -0800 message: Add comments about fixing dates in merged ChangeLogs. diff: === modified file 'admin/bzrmerge.el' --- admin/bzrmerge.el 2011-02-12 23:37:43 +0000 +++ admin/bzrmerge.el 2011-02-23 03:50:04 +0000 @@ -270,6 +270,9 @@ (sit-for 1) ;; (debug 'after-merge) ;; Check the conflicts. + ;; FIXME if using the helpful bzr changelog_merge plugin, + ;; there are normally no conflicts in ChangeLogs. + ;; But we still want the dates fixing, like bzrmerge-resolve does. (let ((conflicted nil) (files ())) (goto-char (point-min)) === modified file 'admin/notes/bzr' --- admin/notes/bzr 2011-02-14 02:52:02 +0000 +++ admin/notes/bzr 2011-02-23 03:50:04 +0000 @@ -112,9 +112,12 @@ revisions gets merged, the actual changes themselves do not. http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00609.html ) -Note that ChangeLog entries are automatically merged to the top with -today's date, but you still might want to check them to see that too -much is not being included, or whitespace between entries is not missing. +In particular, check the ChangeLog entries (eg in case too many +entries have been included or whitespace between entries needs fixing). +bzrmerge tries to fix up the dates to today's date, but it only does +this where there are conflicts. If you used the changelog_merge plugin, +there won't be any conflicts, and (at time of writing) you will need +to adjust dates by hand. Notes: ------------------------------------------------------------ revno: 103393 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 19:44:13 -0800 message: Obsolete dired-x's directory local variables in favor of standard ones. * lisp/dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer. * lisp/dired-x.el (dired-omit-mode): Safe if boolean. (dired-enable-local-variables): Fix doc and custom type. Mark risky. (dired-enable-local-variables, dired-local-variables-file) (dired-hack-local-variables): Make obsolete. (dired-omit-here-always): Use dir-locals.el instead. * doc/misc/dired-x.texi (Features): Don't advertise obsolete local variables. Simplify layout. (Omitting Variables): Update local variables example. (Local Variables): Say this is obsolete. Fix description of dired-enable-local-variables possible values. * etc/NEWS: Relocate the existing entry about directory local variables in file-les buffers, and make it clearer. Mention above dired changes. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-22 13:31:15 +0000 +++ doc/misc/ChangeLog 2011-02-23 03:44:13 +0000 @@ -1,3 +1,11 @@ +2011-02-23 Glenn Morris + + * dired-x.texi (Features): Don't advertise obsolete local variables. + Simplify layout. + (Omitting Variables): Update local variables example. + (Local Variables): Say this is obsolete. Fix description of + dired-enable-local-variables possible values. + 2011-02-21 Lars Ingebrigtsen * gnus.texi (Article Date): Clarify gnus-article-update-date-headers. === modified file 'doc/misc/dired-x.texi' --- doc/misc/dired-x.texi 2011-02-19 20:36:54 +0000 +++ doc/misc/dired-x.texi 2011-02-23 03:44:13 +0000 @@ -129,39 +129,24 @@ @section Features @cindex Features -Some features provided by Dired Extra +Some features provided by Dired Extra: @enumerate @item -Omitting uninteresting files from Dired listing. -@itemize @bullet -@xref{Omitting Files in Dired}. -@end itemize -@item -Local variables for Dired directories. -@itemize @bullet -@xref{Local Variables}. -@end itemize -@item -Guessing shell commands in Dired buffers. -@itemize @bullet -@xref{Shell Command Guessing}. -@end itemize -@item -Running Dired command in non-Dired buffers. -@itemize @bullet -@xref{Virtual Dired}. -@end itemize +Omitting uninteresting files from Dired listing +(@pxref{Omitting Files in Dired}). +@item +Guessing shell commands in Dired buffers +(@pxref{Shell Command Guessing}). +@item +Running Dired command in non-Dired buffers +(@pxref{Virtual Dired}). @item Finding a file mentioned in a buffer -@itemize @bullet -@xref{Find File At Point}. -@end itemize +(@pxref{Find File At Point}). @item -Commands using file marking. -@itemize @bullet -@xref{Advanced Mark Commands}. -@end itemize +Commands using file marking +(@pxref{Advanced Mark Commands}). @end enumerate @noindent @@ -351,27 +336,25 @@ @emph{every} Dired buffer (@pxref{Installation}). You can then use @kbd{M-o} to unomit in that buffer. -To enable omitting automatically only in certain directories one can use Dired -Local Variables and put +To enable omitting automatically only in certain directories you can add +a directory local setting +(@pxref{Directory Variables,,,emacs,The Gnu Emacs manual}) for Dired mode @example -Local Variables: -dired-omit-mode: t -End: +((dired-mode . ((dired-omit-mode . t)))) @end example @noindent -into a file @file{.dired} (the default value of -@code{dired-local-variables-file}) in that directory (@pxref{Local Variables}). +to a @file{.dir-locals.el} file in that directory. @table @code @findex dired-omit-here-always @item dired-omit-here-always This is an interactive function that creates a local variables file exactly -like the example above (if it does not already exist) in the file -@code{dired-local-variables-file} in the current directory and then refreshes -the directory listing (@pxref{Local Variables}). +like the example above (if it does not already exist) in the +@code{dir-locals-file} file in the current directory and then refreshes +the directory listing. @end table @vindex dired-omit-files @@ -490,7 +473,6 @@ call @code{dired-extra-startup}, which in turn calls @code{dired-omit-startup} in your @code{dired-mode-hook}. -@c FIXME does the standard dir-locals mechanism obsolete this? @node Local Variables, Shell Command Guessing, Omitting Files in Dired, Top @chapter Local Variables for Dired Directories @@ -498,10 +480,15 @@ @vindex dired-local-variables-file @vindex dired-enable-local-variables @noindent -When Dired visits a directory, it looks for a file whose name is the value of -variable @code{dired-local-variables-file} (default: @file{.dired}). If such -a file is found, Dired will temporarily insert it into the Dired buffer and -run @code{hack-local-variables}. +This Dired-X feature is obsolete as of Emacs 24.1. The standard Emacs +directory local variables mechanism (@pxref{Directory +Variables,,,emacs,The Gnu Emacs manual}) replaces it. For an example of +the new mechanims, @pxref{Omitting Variables}. + +When Dired visits a directory, it looks for a file whose name is the +value of variable @code{dired-local-variables-file} (default: @file{.dired}). +If such a file is found, Dired will temporarily insert it into the Dired +buffer and run @code{hack-local-variables}. @noindent For example, if the user puts @@ -551,12 +538,10 @@ @item dired-enable-local-variables Default: @code{t} -Controls the use of local-variables lists in Dired. The value can be @code{t}, -@code{nil}, or something else. A value of @code{t} means local-variables -lists are obeyed in the @code{dired-local-variables-file}; @code{nil} means -they are ignored; anything else means query. This variable temporarily -overrides the value of @code{enable-local-variables} when the Dired Local -Variables are hacked. +Controls the use of local-variables lists in Dired. This variable +temporarily overrides the value of @code{enable-local-variables} when +the Dired Local Variables are hacked. It takes the same values as that +variable. A value of @code{nil} means to ignore any Dired Local Variables. @end table @node Shell Command Guessing, Virtual Dired, Local Variables, Top === modified file 'etc/NEWS' --- etc/NEWS 2011-02-16 19:41:31 +0000 +++ etc/NEWS 2011-02-23 03:44:13 +0000 @@ -347,6 +347,12 @@ ** browse-url has gotten a new variable that is used for mailto: URLs, `browse-url-mailto-function', which defaults to `browse-url-mail'. +** Directory local variables can apply to file-less buffers, in certain modes +(eg dired, vc-dir, log-edit). For example, adding +"(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file, +will turn on `whitespace-mode' for *vc-diff* buffers. Modes should +call `hack-dir-local-variables-non-file-buffer' to support this. + ** ERC changes *** New vars `erc-autojoin-timing' and `erc-autojoin-delay'. @@ -412,9 +418,9 @@ *** dired-jump and dired-jump-other-window called with a prefix argument read a file name from the minibuffer instead of using buffer-file-name. -** Directory local variables can apply to file-less buffers. -For example, adding "(diff-mode . ((mode . whitespace)))" to your -.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. ++++ +*** The `dired local variables' feature provided by Dired-x is obsolete. +The standard directory local variables feature replaces it. ** SQL Mode enhancements. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-23 03:24:23 +0000 +++ lisp/ChangeLog 2011-02-23 03:44:13 +0000 @@ -1,5 +1,12 @@ 2011-02-23 Glenn Morris + * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer. + * dired-x.el (dired-omit-mode): Safe if boolean. + (dired-enable-local-variables): Fix doc and custom type. + (dired-enable-local-variables, dired-local-variables-file) + (dired-hack-local-variables): Make obsolete. + (dired-omit-here-always): Use dir-locals.el instead. + * files.el (safe-local-eval-forms): Add the write-file-hooks version. 2011-02-22 Stefan Monnier === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-02-19 20:44:34 +0000 +++ lisp/dired-x.el 2011-02-23 03:44:13 +0000 @@ -145,6 +145,8 @@ (let ((dired-omit-size-limit nil)) (dired-omit-expunge)) (revert-buffer))) +(put 'dired-omit-mode 'safe-local-variable 'booleanp) + ;; For backward compatibility (define-obsolete-variable-alias 'dired-omit-files-p 'dired-omit-mode "22.1") @@ -185,15 +187,19 @@ (defcustom dired-enable-local-variables t "Control use of local-variables lists in Dired. -The value can be t, nil or something else. -A value of t means local-variables lists are obeyed; -nil means they are ignored; anything else means query. - This temporarily overrides the value of `enable-local-variables' when listing a directory. See also `dired-local-variables-file'." - :type 'boolean + :risky t + :type '(choice (const :tag "Query Unsafe" t) + (const :tag "Safe Only" :safe) + (const :tag "Do all" :all) + (const :tag "Ignore" nil) + (other :tag "Query" other)) :group 'dired-x) +(make-obsolete-variable 'dired-enable-local-variables + "use a standard `dir-locals-file' instead." "24.1") + (defcustom dired-guess-shell-gnutar (catch 'found (dolist (exe '("tar" "gtar")) @@ -723,26 +729,25 @@ ;;; LOCAL VARIABLES FOR DIRED BUFFERS. -;; Brief Description: -;;; +;; Brief Description (This feature is obsolete as of Emacs 24.1) +;; ;; * `dired-extra-startup' is part of the `dired-mode-hook'. -;;; +;; ;; * `dired-extra-startup' calls `dired-hack-local-variables' -;;; +;; ;; * `dired-hack-local-variables' checks the value of -;;; `dired-local-variables-file' -;;; +;; `dired-local-variables-file' +;; ;; * Check if `dired-local-variables-file' is a non-nil string and is a -;;; filename found in the directory of the Dired Buffer being created. -;;; +;; filename found in the directory of the Dired Buffer being created. +;; ;; * If `dired-local-variables-file' satisfies the above, then temporarily -;;; include it in the Dired Buffer at the bottom. -;;; +;; include it in the Dired Buffer at the bottom. +;; ;; * Set `enable-local-variables' temporarily to the user variable -;;; `dired-enable-local-variables' and run `hack-local-variables' on the -;;; Dired Buffer. +;; `dired-enable-local-variables' and run `hack-local-variables' on the +;; Dired Buffer. -;; FIXME do standard dir-locals obsolete this? (defcustom dired-local-variables-file (convert-standard-filename ".dired") "Filename, as string, containing local dired buffer variables to be hacked. If this file found in current directory, then it will be inserted into dired @@ -752,6 +757,8 @@ :type 'file :group 'dired) +(make-obsolete-variable 'dired-local-variables-file 'dir-locals-file "24.1") + (defun dired-hack-local-variables () "Evaluate local variables in `dired-local-variables-file' for dired buffer." (and (stringp dired-local-variables-file) @@ -774,22 +781,29 @@ ;; Delete this stuff: `eobp' is used to find last subdir by dired.el. (delete-region opoint (point-max))))) +(make-obsolete 'dired-hack-local-variables + 'hack-dir-local-variables-non-file-buffer "24.1") + +;; Not sure this is worth having a dedicated command for... (defun dired-omit-here-always () - "Create `dired-local-variables-file' for omitting and reverts directory. -Sets `dired-omit-mode' to t in a local variables file that is readable by -dired." + "Create `dir-locals-file' setting `dired-omit-mode' to t in `dired-mode'. +If in a Dired buffer, reverts it." (interactive) (if (file-exists-p dired-local-variables-file) - (message "File `./%s' already exists." dired-local-variables-file) - ;; Create `dired-local-variables-file'. - (with-current-buffer (get-buffer-create " *dot-dired*") - (erase-buffer) - (insert "Local Variables:\ndired-omit-mode: t\nEnd:\n") - (write-file dired-local-variables-file) - (kill-buffer)) + (error "Old-style dired-local-variables-file `./%s' found; +replace it with a dir-locals-file `./%s'" + dired-local-variables-file + dir-locals-file)) + (if (file-exists-p dir-locals-file) + (message "File `./%s' already exists." dir-locals-file) + (with-temp-buffer + (insert "((dired-mode . ((dired-omit-mode . t))))\n") + (write-file dir-locals-file)) ;; Run extra-hooks and revert directory. - (dired-extra-startup) - (dired-revert))) + (when (derived-mode-p 'dired-mode) + (hack-dir-local-variables-non-file-buffer) + (dired-extra-startup) + (dired-revert)))) ;;; GUESS SHELL COMMAND. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-20 11:59:44 +0000 +++ lisp/dired.el 2011-02-23 03:44:13 +0000 @@ -1860,6 +1860,7 @@ (set (make-local-variable 'desktop-save-buffer) 'dired-desktop-buffer-misc-data) (setq dired-switches-alist nil) + (hack-dir-local-variables-non-file-buffer) ; before sorting (dired-sort-other dired-actual-switches t) (when (featurep 'dnd) (set (make-local-variable 'dnd-protocol-alist) @@ -4072,7 +4073,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; "86d436093caa9ae80f7b73915c6a4b4c") +;;;;;; "515e1dbc42acebd9a0175c4209b6673c") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ ------------------------------------------------------------ revno: 103392 committer: Glenn Morris branch nick: trunk timestamp: Tue 2011-02-22 19:24:23 -0800 message: * lisp/files.el (safe-local-eval-forms): Add the write-file-hooks version. This obsolete form is still supported, and present in some of the files synced from gnulib, for example. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-22 18:22:04 +0000 +++ lisp/ChangeLog 2011-02-23 03:24:23 +0000 @@ -1,3 +1,7 @@ +2011-02-23 Glenn Morris + + * files.el (safe-local-eval-forms): Add the write-file-hooks version. + 2011-02-22 Stefan Monnier * help-fns.el (describe-function-1): Don't signal an error just because === modified file 'lisp/files.el' --- lisp/files.el 2011-02-19 19:40:59 +0000 +++ lisp/files.el 2011-02-23 03:24:23 +0000 @@ -2806,7 +2806,9 @@ :type 'alist) (defcustom safe-local-eval-forms - '((add-hook 'write-file-functions 'time-stamp) + ;; This should be here at least as long as Emacs supports write-file-hooks. + '((add-hook 'write-file-hooks 'time-stamp) + (add-hook 'write-file-functions 'time-stamp) (add-hook 'before-save-hook 'time-stamp)) "Expressions that are considered safe in an `eval:' local variable. Add expressions to this list if you want Emacs to evaluate them, when @@ -2814,7 +2816,7 @@ asking you for confirmation." :risky t :group 'find-file - :version "22.2" + :version "24.1" ; added write-file-hooks :type '(repeat sexp)) ;; Risky local variables: ------------------------------------------------------------ revno: 103391 committer: Sam Steingold branch nick: trunk timestamp: Tue 2011-02-22 15:08:00 -0500 message: * lisp/gnus/gnus-msg.el (gnus-setup-message): Also bind `winconf-name'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-22 13:31:15 +0000 +++ lisp/gnus/ChangeLog 2011-02-22 20:08:00 +0000 @@ -1,3 +1,7 @@ +2011-02-22 Sam Steingold + + * gnus-msg.el (gnus-setup-message): Also bind `winconf-name'. + 2011-02-22 Lars Ingebrigtsen * gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-02-22 13:31:15 +0000 +++ lisp/gnus/gnus-msg.el 2011-02-22 20:08:00 +0000 @@ -383,6 +383,7 @@ (defvar gnus-article-reply nil) (defmacro gnus-setup-message (config &rest forms) (let ((winconf (make-symbol "gnus-setup-message-winconf")) + (winconf-name (make-symbol "gnus-setup-message-winconf")) (buffer (make-symbol "gnus-setup-message-buffer")) (article (make-symbol "gnus-setup-message-article")) (yanked (make-symbol "gnus-setup-yanked-articles")) ------------------------------------------------------------ revno: 103390 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-02-22 10:32:51 -0800 message: * dired.c (Ffile_attributes): Simplify and avoid #ifdef. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-22 18:02:11 +0000 +++ src/ChangeLog 2011-02-22 18:32:51 +0000 @@ -1,3 +1,7 @@ +2011-02-22 Paul Eggert + + * dired.c (Ffile_attributes): Simplify and avoid #ifdef. + 2011-02-22 Wolfgang Jenkner (tiny change) * lread.c (openp): Correct Boolean typo in last commit. === modified file 'src/dired.c' --- src/dired.c 2011-02-22 01:55:20 +0000 +++ src/dired.c 2011-02-22 18:32:51 +0000 @@ -963,17 +963,8 @@ if (lstat (SSDATA (encoded), &s) < 0) return Qnil; - switch (s.st_mode & S_IFMT) - { - default: - values[0] = Qnil; break; - case S_IFDIR: - values[0] = Qt; break; -#ifdef S_IFLNK - case S_IFLNK: - values[0] = Ffile_symlink_p (filename); break; -#endif - } + values[0] = (S_ISLNK (s.st_mode) ? Ffile_symlink_p (filename) + : S_ISDIR (s.st_mode) ? Qt : Qnil); values[1] = make_number (s.st_nlink); if (!(NILP (id_format) || EQ (id_format, Qinteger))) ------------------------------------------------------------ revno: 103389 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-02-22 13:22:04 -0500 message: * lisp/help-fns.el (describe-function-1): Don't signal an error just because the DOC file disappeared. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-22 05:50:25 +0000 +++ lisp/ChangeLog 2011-02-22 18:22:04 +0000 @@ -1,3 +1,8 @@ +2011-02-22 Stefan Monnier + + * help-fns.el (describe-function-1): Don't signal an error just because + the DOC file disappeared. + 2011-02-22 Seppo Sade (tiny change) * eshell/esh-ext.el (eshell-external-command): Do not restrict @@ -29,10 +34,10 @@ * faces.el (color-values): Use cond for clarity. Doc fix. - * facemenu.el (color-rgb-to-hsv): Deleted; use the version in + * facemenu.el (color-rgb-to-hsv): Delete; use the version in color.el instead. - (list-colors-sort-key, list-colors-print): Use - color-normalized-values. + (list-colors-sort-key, list-colors-print): + Use color-normalized-values. 2011-02-20 Drew Adams @@ -82,8 +87,8 @@ (vc-bzr-error-regex-alist): New var. (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer. - * vc/vc-dispatcher.el (vc-do-async-command): Bind - inhibit-read-only to t. + * vc/vc-dispatcher.el (vc-do-async-command): + Bind inhibit-read-only to t. * progmodes/compile.el (compilation--flush-directory-cache): Handle the case where cdr of compilation--flush-directory-cache @@ -147,8 +152,8 @@ * apropos.el (apropos-print): Call apropos-mode before setting up buffer variables. Use inhibit-read-only. - * emacs-lisp/package.el (package--list-packages): Call - package-menu-mode before setting up buffer variables. + * emacs-lisp/package.el (package--list-packages): + Call package-menu-mode before setting up buffer variables. * play/solitaire.el (solitaire): Call solitaire-mode before setting up buffer variables. Use inhibit-read-only. @@ -8520,7 +8525,7 @@ (sql-interactive-mode-menu): Add "Save Connection" item. (sql-add-product): Fix menu item. (sql-get-product-feature): Improved error handling. - (sql--alt-buffer-part, sql--alt-if-not-empty): Removed. + (sql--alt-buffer-part, sql--alt-if-not-empty): Remove. (sql-make-alternate-buffer-name): Simplified. (sql-product-interactive): Handle missing product. (sql-connect): Support string keys, minor improvements. @@ -8915,7 +8920,7 @@ (delete-backward-char): Implement in Lisp. (delete-forward-char): New command. - * mouse.el (mouse-region-delete-keys): Deleted. + * mouse.el (mouse-region-delete-keys): Delete. (mouse-show-mark): Simplify. * bindings.el (global-map): Bind delete and DEL, the former to @@ -13224,7 +13229,7 @@ (ada-goto-label-re): New; matches goto labels. (ada-block-label-re): New; matches block labels. (ada-label-re): New; matches both. - (ada-named-block-re): Deleted; callers changed to use + (ada-named-block-re): Delete; callers changed to use `ada-block-label-re' instead. (ada-get-current-indent, ada-get-indent-noindent, ada-get-indent-loop): Use `ada-block-label-re'. @@ -20844,7 +20849,7 @@ (def-gdb-memory-format, def-gdb-memory-unit): Update memory buffer after changing settings. (gdb-invalidate-disassembly): Update when first shown. - (gdb-edit-locals-value): Fixed. + (gdb-edit-locals-value): Fix. (gdb-registers-handler-custom): Print registers in right order and allow changing register values (only for current thread yet). (gdb-breakpoints-mode-map): Don't assume threads buffer is present. @@ -20895,7 +20900,7 @@ 2009-08-06 Dmitry Dzhus - * progmodes/gdb-mi.el (gdb-var-create-regexp): Removed. + * progmodes/gdb-mi.el (gdb-var-create-regexp): Remove. (gdb-var-create-handler): Rewritten using JSON parser. (gdb-propertize-header): Move earlier. (gdb-set-header): Remove to avoid duplication. === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2011-01-25 04:08:28 +0000 +++ lisp/help-fns.el 2011-02-22 18:22:04 +0000 @@ -476,7 +476,8 @@ (let* ((advertised (gethash def advertised-signature-table t)) (arglist (if (listp advertised) advertised (help-function-arglist def))) - (doc (documentation function)) + (doc (condition-case err (documentation function) + (error (format "No Doc! %S" err)))) (usage (help-split-fundoc doc function))) (with-current-buffer standard-output ;; If definition is a keymap, skip arglist note. ------------------------------------------------------------ revno: 103388 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-02-22 20:08:53 +0200 message: Fix revision 103385. etags.c (canonicalize_filename, ISUPPER): Fix last change. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-02-22 17:51:38 +0000 +++ lib-src/ChangeLog 2011-02-22 18:08:53 +0000 @@ -1,5 +1,7 @@ 2011-02-22 Eli Zaretskii + * etags.c (canonicalize_filename, ISUPPER): Fix last change. + * makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend on ../lib/min-max.h. === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-02-22 17:37:06 +0000 +++ lib-src/etags.c 2011-02-22 18:08:53 +0000 @@ -236,6 +236,7 @@ #define ISALNUM(c) isalnum (CHAR(c)) #define ISALPHA(c) isalpha (CHAR(c)) #define ISDIGIT(c) isdigit (CHAR(c)) +#define ISUPPER(c) isupper (CHAR(c)) #define ISLOWER(c) islower (CHAR(c)) #define lowcase(c) tolower (CHAR(c)) @@ -6648,7 +6649,7 @@ #ifdef DOS_NT /* Canonicalize drive letter case. */ if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) - fn[0] = downcase (fn[0]); + fn[0] = lowcase (fn[0]); sep = '\\'; #endif ------------------------------------------------------------ revno: 103387 author: Wolfgang Jenkner committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-02-22 13:02:11 -0500 message: * src/lread.c (openp): Correct Boolean typo in last commit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-22 14:13:54 +0000 +++ src/ChangeLog 2011-02-22 18:02:11 +0000 @@ -1,8 +1,11 @@ +2011-02-22 Wolfgang Jenkner (tiny change) + + * lread.c (openp): Correct Boolean typo in last commit. + 2011-02-22 Adrian Robert * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified - key to emacs, treat as unmodified (go to input manager - processing). + key to Emacs, treat as unmodified (go to input manager processing). 2011-02-22 Paul Eggert === modified file 'src/lread.c' --- src/lread.c 2011-02-22 01:55:20 +0000 +++ src/lread.c 2011-02-22 18:02:11 +0000 @@ -1384,7 +1384,7 @@ Lisp_Object tmp = call1 (predicate, string); exists = !NILP (tmp) && (EQ (tmp, Qdir_ok) - || !NILP (Ffile_directory_p (string))); + || NILP (Ffile_directory_p (string))); } if (exists) ------------------------------------------------------------ revno: 103386 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-02-22 19:51:38 +0200 message: MS-Windows part of revision 103378, addition of min-max.h. lib-src/makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend on ../lib/min-max.h. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-02-22 17:37:06 +0000 +++ lib-src/ChangeLog 2011-02-22 17:51:38 +0000 @@ -1,3 +1,8 @@ +2011-02-22 Eli Zaretskii + + * makefile.w32-in ($(BLD)/ebrowse.$(O), $(BLD)/pop.$(O)): Depend + on ../lib/min-max.h. + 2011-02-22 Paul Eggert etags: Downcase drive letters, for consistency with Emacs proper. @@ -7,6 +12,11 @@ Assume S_ISLNK etc. work, since gnulib supports this. * etags.c (S_ISREG): Remove. +2011-02-22 Paul Eggert + + Assume S_ISLNK etc. work, since gnulib supports this. + * etags.c (S_ISREG): Remove. + 2011-02-22 Juanma Barranquero * makefile.w32-in (obj): Remove filemode.o. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2011-02-22 00:49:54 +0000 +++ lib-src/makefile.w32-in 2011-02-22 17:51:38 +0000 @@ -381,6 +381,13 @@ $(SRC)/ntlib.h \ $(EMACS_ROOT)/lib/getopt.h +$(BLD)/ebrowse.$(O) : \ + $(SRC)/ebrowse.c \ + $(EMACS_ROOT)/lib/min-max.h \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/lib-src/../src/config.h + $(BLD)/emacsclient.$(O) : \ $(SRC)/emacsclient.c \ $(EMACS_ROOT)/nt/inc/sys/stat.h \ @@ -447,6 +454,7 @@ $(BLD)/pop.$(O) : \ $(SRC)/pop.c \ $(SRC)/pop.h \ + $(EMACS_ROOT)/lib/min-max.h \ $(SRC)/ntlib.h $(BLD)/profile.$(O) : \ ------------------------------------------------------------ revno: 103385 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-02-22 09:37:06 -0800 message: etags: Downcase drive letters, for consistency with Emacs proper. * etags.c (upcase): Remove; no longer used. (canonicalize_filename): Downcase drive letters. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-02-22 01:58:44 +0000 +++ lib-src/ChangeLog 2011-02-22 17:37:06 +0000 @@ -1,5 +1,9 @@ 2011-02-22 Paul Eggert + etags: Downcase drive letters, for consistency with Emacs proper. + * etags.c (upcase): Remove; no longer used. + (canonicalize_filename): Downcase drive letters. + Assume S_ISLNK etc. work, since gnulib supports this. * etags.c (S_ISREG): Remove. === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-02-22 01:55:20 +0000 +++ lib-src/etags.c 2011-02-22 17:37:06 +0000 @@ -239,7 +239,6 @@ #define ISLOWER(c) islower (CHAR(c)) #define lowcase(c) tolower (CHAR(c)) -#define upcase(c) toupper (CHAR(c)) /* @@ -6638,7 +6637,7 @@ ); } -/* Upcase DOS drive letter and collapse separators into single slashes. +/* Downcase DOS drive letter and collapse separators into single slashes. Works in place. */ static void canonicalize_filename (register char *fn) @@ -6648,8 +6647,8 @@ #ifdef DOS_NT /* Canonicalize drive letter case. */ - if (fn[0] != '\0' && fn[1] == ':' && ISLOWER (fn[0])) - fn[0] = upcase (fn[0]); + if (fn[0] != '\0' && fn[1] == ':' && ISUPPER (fn[0])) + fn[0] = downcase (fn[0]); sep = '\\'; #endif ------------------------------------------------------------ revno: 103384 committer: Adrian Robert branch nick: trunk timestamp: Tue 2011-02-22 16:13:54 +0200 message: * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified key to emacs, treat as unmodified (go to input manager processing). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-22 13:27:23 +0000 +++ src/ChangeLog 2011-02-22 14:13:54 +0000 @@ -1,3 +1,9 @@ +2011-02-22 Adrian Robert + + * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified + key to emacs, treat as unmodified (go to input manager + processing). + 2011-02-22 Paul Eggert Assume S_ISLNK etc. work, since gnulib supports this. === modified file 'src/nsterm.m' --- src/nsterm.m 2011-02-17 10:19:29 +0000 +++ src/nsterm.m 2011-02-22 14:13:54 +0000 @@ -4542,6 +4542,7 @@ /* if it was a function key or had modifiers, pass it directly to emacs */ if (fnKeysym || (emacs_event->modifiers + && (emacs_event->modifiers != shift_modifier) && [[theEvent charactersIgnoringModifiers] length] > 0)) /*[[theEvent characters] length] */ { ------------------------------------------------------------ revno: 103383 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-02-22 13:31:15 +0000 message: Merge changes made in Gnus trunk. gnus.texi (Article Date): Clarify gnus-article-update-date-headers. gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name after exit. gnus-sum.el (gnus-summary-show-article): When called with t as the value, show the raw article. nnimap.el (nnimap-open-connection-1): Revert last change, since auth-source now accepts numbers. auth-source.el (auth-source-netrc-parse): Accept a number as the port spec, too. (auth-source-ensure-strings): New function. gnus-art.el (gnus-article-update-date-headers): Doc fix. (gnus-article-setup-buffer): Always restart the date timer so that user changes to the frequency is respected. nnimap.el (nnimap-open-connection-1): auth-source expects strings as port numbers, so make sure it gets that if nnimap-server-port is explicit. nnimap.el (nnimap-inbox): Doc fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-21 13:29:15 +0000 +++ doc/misc/ChangeLog 2011-02-22 13:31:15 +0000 @@ -1,3 +1,7 @@ +2011-02-21 Lars Ingebrigtsen + + * gnus.texi (Article Date): Clarify gnus-article-update-date-headers. + 2011-02-20 Lars Ingebrigtsen * gnus.texi (Window Layout): Document layout names. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-02-21 13:29:15 +0000 +++ doc/misc/gnus.texi 2011-02-22 13:31:15 +0000 @@ -9502,8 +9502,11 @@ Date: 6 weeks, 4 days, 1 hour, 3 minutes, 8 seconds ago @end example -This line is updated continually by default. If you wish to switch -that off, say: +This line is updated continually by default. The frequency (in +seconds) is controlled by the @code{gnus-article-update-date-headers} +variable. + +If you wish to switch updating off, say: @vindex gnus-article-update-date-headers @lisp === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-21 13:29:15 +0000 +++ lisp/gnus/ChangeLog 2011-02-22 13:31:15 +0000 @@ -1,3 +1,32 @@ +2011-02-22 Lars Ingebrigtsen + + * gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name + after exit. + + * gnus-sum.el (gnus-summary-show-article): When called with t as the + value, show the raw article. + +2011-02-21 Lars Ingebrigtsen + + * nnimap.el (nnimap-open-connection-1): Revert last change, since + auth-source now accepts numbers. + + * auth-source.el (auth-source-netrc-parse): Accept a number as the port + spec, too. + (auth-source-ensure-strings): New function. + + * gnus-art.el (gnus-article-update-date-headers): Doc fix. + (gnus-article-setup-buffer): Always restart the date timer so that user + changes to the frequency is respected. + + * nnimap.el (nnimap-open-connection-1): auth-source expects strings as + port numbers, so make sure it gets that if nnimap-server-port is + explicit. + +2011-02-21 Simon Josefsson + + * nnimap.el (nnimap-inbox): Doc fix. + 2011-02-20 Chong Yidong * shr-color.el (shr-color->hexadecimal): Use renamed function names === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2011-02-21 13:29:15 +0000 +++ lisp/gnus/auth-source.el 2011-02-22 13:31:15 +0000 @@ -680,6 +680,15 @@ ;;; Backend specific parsing: netrc/authinfo backend +(defun auth-source-ensure-strings (values) + (unless (listp values) + (setq values (list values))) + (mapcar (lambda (value) + (if (numberp value) + (format "%s" value) + value)) + values)) + (defvar auth-source-netrc-cache nil) ;;; (auth-source-netrc-parse "~/.authinfo.gpg") @@ -693,6 +702,7 @@ ;; We got already parsed contents; just return it. file (when (file-exists-p file) + (setq port (auth-source-ensure-strings port)) (with-temp-buffer (let ((tokens '("machine" "host" "default" "login" "user" "password" "account" "macdef" "force" === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-02-20 04:08:04 +0000 +++ lisp/gnus/gnus-art.el 2011-02-22 13:31:15 +0000 @@ -1040,7 +1040,7 @@ (item :tag "User-defined" :value 'user-defined))) (defcustom gnus-article-update-date-headers 1 - "How often to update the date header. + "A number that says how often to update the date header (in seconds). If nil, don't update it at all." :version "24.1" :group 'gnus-article-headers @@ -4505,13 +4505,10 @@ (setq gnus-summary-buffer (gnus-summary-buffer-name gnus-newsgroup-name)) (gnus-summary-set-local-parameters gnus-newsgroup-name) - (cond - ((and gnus-article-update-date-headers - (not article-lapsed-timer)) + (when article-lapsed-timer + (gnus-stop-date-timer)) + (when gnus-article-update-date-headers (gnus-start-date-timer gnus-article-update-date-headers)) - ((and (not gnus-article-update-date-headers) - article-lapsed-timer) - (gnus-stop-date-timer))) (current-buffer))))) ;; Set article window start at LINE, where LINE is the number of lines === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-02-15 11:24:37 +0000 +++ lisp/gnus/gnus-msg.el 2011-02-22 13:31:15 +0000 @@ -388,6 +388,7 @@ (yanked (make-symbol "gnus-setup-yanked-articles")) (group (make-symbol "gnus-setup-message-group"))) `(let ((,winconf (current-window-configuration)) + (,winconf-name gnus-current-window-configuration) (,buffer (buffer-name (current-buffer))) (,article gnus-article-reply) (,yanked gnus-article-yanked-articles) @@ -432,7 +433,7 @@ (progn ,@forms) (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config - ,yanked) + ,yanked ,winconf-name) (setq gnus-message-buffer (current-buffer)) (set (make-local-variable 'gnus-message-group-art) (cons ,group ,article)) @@ -527,7 +528,8 @@ (throw 'found (cons (cadr elem) (caddr elem))))))))) (defun gnus-inews-add-send-actions (winconf buffer article - &optional config yanked) + &optional config yanked + winconf-name) (gnus-make-local-hook 'message-sent-hook) (add-hook 'message-sent-hook (if gnus-agent 'gnus-agent-possibly-do-gcc 'gnus-inews-do-gcc) nil t) @@ -538,8 +540,10 @@ `(lambda (&optional arg) (gnus-post-method arg ,gnus-newsgroup-name))) (message-add-action - `(when (gnus-buffer-exists-p ,buffer) - (set-window-configuration ,winconf)) + `(progn + (setq gnus-current-window-configuration ,winconf-name) + (when (gnus-buffer-exists-p ,buffer) + (set-window-configuration ,winconf))) 'exit 'postpone 'kill) (let ((to-be-marked (cond (yanked === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-02-21 13:29:15 +0000 +++ lisp/gnus/gnus-sum.el 2011-02-22 13:31:15 +0000 @@ -9525,8 +9525,7 @@ ((not arg) ;; Select the article the normal way. (gnus-summary-select-article nil 'force)) - ((or (equal arg '(16)) - (eq arg t)) + ((equal arg '(16)) ;; C-u C-u g (let ((gnus-inhibit-article-treatments t)) (gnus-summary-select-article nil 'force))) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-02-20 04:08:04 +0000 +++ lisp/gnus/nnimap.el 2011-02-22 13:31:15 +0000 @@ -72,14 +72,15 @@ "ssh %s imapd")) (defvoo nnimap-inbox nil - "The mail box where incoming mail arrives and should be split out of.") + "The mail box where incoming mail arrives and should be split out of. +For example, \"INBOX\".") (defvoo nnimap-split-methods nil "How mail is split. -Uses the same syntax as nnmail-split-methods") +Uses the same syntax as `nnmail-split-methods'.") (defvoo nnimap-split-fancy nil - "Uses the same syntax as nnmail-split-fancy.") + "Uses the same syntax as `nnmail-split-fancy'.") (defvoo nnimap-unsplittable-articles '(%Deleted %Seen) "Articles with the flags in the list will not be considered when splitting.") ------------------------------------------------------------ revno: 103382 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2011-02-22 14:27:23 +0100 message: src/ChangeLog: Fix typos. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-02-22 01:55:20 +0000 +++ src/ChangeLog 2011-02-22 13:27:23 +0000 @@ -12,7 +12,7 @@ Assume S_ISDIR works. (Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether fifos exist. - (Ffile_regular_p, Finsert_file_contents): Assumes S_ISREG works. + (Ffile_regular_p, Finsert_file_contents): Assume S_ISREG works. * filelock.c (S_ISLNK): Remove. * lread.c (openp): Assume S_ISDIR works. * xrdb.c (S_ISDIR): Remove. @@ -20,7 +20,7 @@ 2011-02-21 Eli Zaretskii * makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to - lib/makefilw.w32-in. + lib/makefile.w32-in. ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h. (GLOBAL_SOURCES): Remove filemode.c. (OBJ1): Remove $(BLD)/filemode.$(O). @@ -40,7 +40,7 @@ * makefile.w32-in ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD. -2011-02-20 Christoph Scholtes +2011-02-20 Christoph Scholtes * makefile.w32-in: Remove md5.$(O). ($(BLD)/md5.$(O)): Remove prerequisites, moved to @@ -744,14 +744,14 @@ to const char *, since they're usually low-level C strings, and this stays compatible with C89 pointer rules. All callers changed. - * charset.c: conform to C89 pointer rules + * charset.c: Conform to C89 pointer rules. (define_charset_internal): Switch between char * and unsigned char *. - * xmenu.c: conform to C89 const rules + * xmenu.c: Conform to C89 const rules. (xmenu_show, xdialog_show): Declare local var as char *, not const char *, to stay compatible with C89 const rules. - * xdisp.c: conform to C89 pointer rules + * xdisp.c: Conform to C89 pointer rules. (store_mode_line_noprop, display_string, reseat_to_string): (c_string_pos, number_of_chars, message_dolog): (message_log_check_duplicate, set_message_1, store_mode_line_noprop): @@ -759,7 +759,7 @@ Switch between char * and unsigned char * to stay compatible wth C89 pointer rules. - * regex.c: conform to C89 pointer rules + * regex.c: Conform to C89 pointer rules. (re_wctype): Add cast, as C89 does not allow assigning between char * and unsigned char *. (regex_compile): Likewise. @@ -916,10 +916,10 @@ (ns_string_to_pasteboard_internal): Use initWithBytesNoCopy instead of stringWithUTF8String (Bug#7934). -2011-01-29 Anders Lindgren (tiny change) +2011-01-29 Anders Lindgren (tiny change) - * nsfont.m (nsfont_open): Ensure that fonts with inexact - descenders would not become one pixel too tall (Bug#7887). + * nsfont.m (nsfont_open): Ensure that fonts with inexact + descenders would not become one pixel too tall (Bug#7887). 2011-01-28 Chong Yidong @@ -1090,7 +1090,6 @@ f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script and corresponding defines. - 2011-01-19 Sam Steingold * w32.c (check_windows_init_file): Remove declarations of @@ -2195,10 +2194,10 @@ * nsmenu.m: Use #include instead of "config.h". * term.c (Qglyphless_char,last_glyphless_glyph_frame) - (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id): + (last_glyphless_glyph_face_id, last_glyphless_glyph_merged_face_id): Move declarations ... * lisp.h (Qglyphless_char,last_glyphless_glyph_frame) - (last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id): + (last_glyphless_glyph_face_id, last_glyphless_glyph_merged_face_id): ... here. * emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits) @@ -2302,7 +2301,7 @@ (Qonly): Remove declarations. * lisp.h (pending_malloc_warning, Vsaved_region_selection) (Vselect_active_regions): - * keyboard.h (timers_run): Add declarations. + * keyboard.h (timers_run): Add declarations. * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) (tm_diff): Convert definitions to standard C. @@ -2436,7 +2435,7 @@ 2010-11-14 YAMAMOTO Mitsuharu - * keyboard.c (modify_event_symbol) : Add const to array elements of + * keyboard.c (modify_event_symbol): Add const to array elements of arg NAME_TABLE. (lispy_accent_keys, lispy_function_keys, lispy_multimedia_keys) (lispy_kana_keys, iso_lispy_function_keys, lispy_wheel_names) @@ -2527,7 +2526,6 @@ (x_set_sticky): Pass atoms to set_wm_state. (do_ewmh_fullscreen): Ditto. - * xterm.h (x_display_info): Add Xatom_net_supported, Xatom_net_supporting_wm_check, Xatom_net_active_window, Xatom_net_wm_window_opacity, Xatom_XEMBED_INFO, SM_CLIENT_ID. @@ -2731,10 +2729,9 @@ * coding.c (coding-category-list): Refer to set-coding-system-priority instead of the obsolete set-coding-priority in the doc string. - 2010-11-04 Adrian Robert - * nsfont.m (nsfont_draw): Correct previous patch to return + * nsfont.m (nsfont_draw): Correct previous patch to return correct value. * nsimage.m (EmacsImage-setXBMColor:): Correct previous patch: don't change the method signature, change the return. @@ -4593,7 +4590,7 @@ 2010-08-16 Jan Djärv - * nsselect.m: include keyboard.h for QPRIMARY, remove its + * nsselect.m: Include keyboard.h for QPRIMARY, remove its declaration (Bug#6863). (syms_of_nsselect): Don't intern QPRIMARY. @@ -4654,7 +4651,7 @@ * w32menu.c (simple_dialog_show): Use unicode message box if available. (MessageBoxW_Proc): New function typedef. (unicode-message-box): New function pointer. - (globals_of_w32menu): Import it from user32.dll. (Bug#5629) + (globals_of_w32menu): Import it from user32.dll. (Bug#5629) 2010-08-13 Jan Djärv @@ -8154,7 +8151,7 @@ 2010-04-30 Jan Djärv - * xsettings.c: include limits.h and update file comment. + * xsettings.c: Include limits.h and update file comment. 2010-04-30 Glenn Morris @@ -8931,7 +8928,7 @@ * menu.c (digest_single_submenu): If USE_LUCID and HAVE_XFT, encode menu items in UTF-8. - * xmenu.c: include xsettings.h and xlwmenu.h if USE_LUCID. + * xmenu.c: Include xsettings.h and xlwmenu.h if USE_LUCID. (apply_systemfont_to_menu): New function. (set_frame_menubar, create_and_show_popup_menu): Call apply_systemfont_to_menu. @@ -9230,7 +9227,7 @@ rather than appending it. (handle_stop_backwards): New function. (reseat_1, pop_it, push_it): Set prev_stop and base_level_stop. - (reseat): call handle_stop_backwards to recompute prev_stop and + (reseat): Call handle_stop_backwards to recompute prev_stop and base_level_stop for the new position. (handle_invisible_prop): Under bidi iteration, skip invisible text using bidi_get_next_char_visually. If we are `reseat'ed, init the ------------------------------------------------------------ revno: 103381 committer: Michael Albinus branch nick: trunk timestamp: Tue 2011-02-22 06:50:25 +0100 message: * eshell/esh-ext.el (eshell-external-command): Do not restrict remote check to "ftp". (Bug#8089) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-21 21:25:35 +0000 +++ lisp/ChangeLog 2011-02-22 05:50:25 +0000 @@ -1,3 +1,8 @@ +2011-02-22 Seppo Sade (tiny change) + + * eshell/esh-ext.el (eshell-external-command): Do not restrict + remote check to "ftp". (Bug#8089) + 2011-02-21 Alan Mackenzie Fix bug #7930. === modified file 'lisp/eshell/esh-ext.el' --- lisp/eshell/esh-ext.el 2011-01-25 04:08:28 +0000 +++ lisp/eshell/esh-ext.el 2011-02-22 05:50:25 +0000 @@ -202,7 +202,7 @@ (defun eshell-external-command (command args) "Insert output from an external COMMAND, using ARGS." (setq args (eshell-stringify-list (eshell-flatten-list args))) - (if (string-equal (file-remote-p default-directory 'method) "ftp") + (if (file-remote-p default-directory) (eshell-remote-command command args)) (let ((interp (eshell-find-interpreter command))) (assert interp) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.