From b9c82730f91a85fbeeb68edd0310d33d8f8f5ff7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 16 Feb 2011 20:46:55 -0500 Subject: [PATCH 01/18] Don't let-bind copyright-update in nnfolder-save-buffer. See: http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00284.html http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00651.html * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, in case it's not yet loaded. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnfolder.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index eecbe978c29..f62a98c639b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-02-17 Chong Yidong + + * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, + in case it's not yet loaded. + 2011-01-13 Chong Yidong * message.el (message-bury): Add special-case handling for Rmail. diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index a93f0913e42..d90e836e246 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -1099,8 +1099,8 @@ This command does not work if you use short group names." (gnus-make-directory (file-name-directory (buffer-file-name))) (let ((coding-system-for-write (or nnfolder-file-coding-system-for-write - nnfolder-file-coding-system)) - (copyright-update nil)) + nnfolder-file-coding-system))) + (set (make-local-variable 'copyright-update) nil) (save-buffer))) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil) (nnfolder-save-nov))) From b8bd990898de3fc96b9773c4c8665bf56f334503 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Feb 2011 23:27:37 -0800 Subject: [PATCH 02/18] log-edit.el fix for bug#8057. * lisp/log-edit.el (log-edit-insert-changelog): Fix `log-edit-strip-single-file-name' functionality. --- lisp/ChangeLog | 5 +++++ lisp/log-edit.el | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d8446cef10..638342739e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-17 Glenn Morris + + * log-edit.el (log-edit-insert-changelog): + Fix `log-edit-strip-single-file-name' functionality. (Bug#8057) + 2011-02-14 Chong Yidong * pgg-gpg.el (pgg-gpg-process-region): Bind diff --git a/lisp/log-edit.el b/lisp/log-edit.el index 865b1f31818..373cc31e0cd 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el @@ -621,14 +621,18 @@ regardless of user name or time." (delete-region start end) (rfc822-goto-eoh) (insert "Fixes: " fixes "\n" (if (looking-at "\n") "" "\n"))))) - (goto-char (point-min)) - (when (and log-edit-strip-single-file-name (looking-at "\\*\\s-+")) - (forward-line 1) - (when (not (re-search-forward "^\\*\\s-+" nil t)) - (goto-char (point-min)) - (skip-chars-forward "^():") - (skip-chars-forward ": ") - (delete-region (point-min) (point)))))) + (and log-edit-strip-single-file-name + (progn (rfc822-goto-eoh) + (if (looking-at "\n") (forward-char 1)) + (looking-at "\\*\\s-+")) + (let ((start (point))) + (forward-line 1) + (when (not (re-search-forward "^\\*\\s-+" nil t)) + (goto-char start) + (skip-chars-forward "^():") + (skip-chars-forward ": ") + (delete-region start (point))))) + (goto-char (point-min)))) ;;;; ;;;; functions for getting commit message from ChangeLog a file... From 41002397eec14de42b7786f4ecc195388d8cd309 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Feb 2011 23:43:53 -0800 Subject: [PATCH 03/18] * lisp/simple.el (rfc822-goto-eoh): Give it a doc-string. --- lisp/ChangeLog | 2 ++ lisp/simple.el | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 638342739e1..98a9e06e406 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-02-17 Glenn Morris + * simple.el (rfc822-goto-eoh): Give it a doc-string. + * log-edit.el (log-edit-insert-changelog): Fix `log-edit-strip-single-file-name' functionality. (Bug#8057) diff --git a/lisp/simple.el b/lisp/simple.el index 6e26e334372..8f37c8e5f0b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5585,7 +5585,10 @@ appears to have customizations applying to the old default, 'mail-send-and-exit) (defun rfc822-goto-eoh () - ;; Go to header delimiter line in a mail message, following RFC822 rules + "If the buffer starts with a mail header, move point to the header's end. +Otherwise, moves to `point-min'. +The end of the header is the start of the next line, if there is one, +else the end of the last line. This function obeys RFC822." (goto-char (point-min)) (when (re-search-forward "^\\([:\n]\\|[^: \t\n]+[ \t\n]\\)" nil 'move) From dff9ac46596173b651941dc1b16c78b1a1ab11f1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 Feb 2011 21:11:26 -0800 Subject: [PATCH 04/18] * doc/lispref/keymaps.texi (Remapping Commands): Mention how to undo it. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/keymaps.texi | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 56f35ef3296..664464acda2 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Glenn Morris + + * keymaps.texi (Remapping Commands): Mention how to undo it. + 2011-02-05 Chong Yidong * commands.texi (Accessing Mouse): Note that a header line is not diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 1763f3936c9..bc1937442f8 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -1510,6 +1510,12 @@ does not have the effect of remapping @code{kill-line} into if an ordinary binding specifies @code{my-kill-line}, this keymap will remap it to @code{my-other-kill-line}. +To undo the remapping of a command, remap it to @code{nil}; e.g. + +@smallexample +(define-key my-mode-map [remap kill-line] nil) +@end smallexample + @defun command-remapping command &optional position keymaps This function returns the remapping for @var{command} (a symbol), given the current active keymaps. If @var{command} is not remapped From 72d6685c11031df64b7b039fa658d2fe7727316d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 Feb 2011 21:15:22 -0800 Subject: [PATCH 05/18] * lisp/files.el (find-file-literally): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/files.el | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 98a9e06e406..cdf6dbf4944 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Glenn Morris + + * files.el (find-file-literally): Doc fix. + 2011-02-17 Glenn Morris * simple.el (rfc822-goto-eoh): Give it a doc-string. diff --git a/lisp/files.el b/lisp/files.el index b026bf3352f..88063aed2b9 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2008,7 +2008,8 @@ Don't call it from programs! Use `insert-file-contents-literally' instead. (defvar find-file-literally nil "Non-nil if this buffer was made by `find-file-literally' or equivalent. -This is a permanent local.") +This has the `permanent-local' property, which takes effect if you +make the variable buffer-local.") (put 'find-file-literally 'permanent-local t) (defun find-file-literally (filename) From 85ee3c753c4c35b2fd215440ae2d3d36bf682a0e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 Feb 2011 21:17:10 -0800 Subject: [PATCH 06/18] * lisp/gnus.el (gnus-meta): Doc fix. --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/gnus.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f62a98c639b..1b2ef3e167e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Glenn Morris + + * gnus.el (gnus-meta): Doc fix. + 2011-02-17 Chong Yidong * nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update, diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index a5140542fcc..5180673386c 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -275,7 +275,7 @@ (defgroup gnus-meta nil "Meta variables controlling major portions of Gnus. -In general, modifying these variables does not take affect until Gnus +In general, modifying these variables does not take effect until Gnus is restarted, and sometimes reloaded." :group 'gnus) From 86ec878a6b04348c0931d10d630f07becd8d8c30 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 12:04:48 +0200 Subject: [PATCH 07/18] Improve documentation of permanent local variables. variables.texi (Creating Buffer-Local): Explain the meaning of permanent local variables. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/variables.texi | 2 ++ 2 files changed, 7 insertions(+) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 664464acda2..1d95eaf678c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2011-02-18 Eli Zaretskii + + * variables.texi (Creating Buffer-Local): Explain the meaning of + permanent local variables. + 2011-02-18 Glenn Morris * keymaps.texi (Remapping Commands): Mention how to undo it. diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 2baf3895822..18343b4dc85 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1409,6 +1409,8 @@ subsequent major mode. @xref{Hooks}. @cindex permanent local variable A buffer-local variable is @dfn{permanent} if the variable name (a symbol) has a @code{permanent-local} property that is non-@code{nil}. +Such variables are unaffected by @code{kill-all-local-variables}, and +their local bindings are therefore not cleared by changing major modes. Permanent locals are appropriate for data pertaining to where the file came from or how to save it, rather than with how to edit the contents. From e03b2fd40d5d4fda99e242c8ee9d9ca1c1d258ad Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 12:23:51 +0200 Subject: [PATCH 08/18] Document find-file-literally in the ELisp manual. files.texi (Visiting Functions): Document find-file-literally, both the command and the variable. --- doc/lispref/ChangeLog | 3 +++ doc/lispref/files.texi | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1d95eaf678c..8673ed51907 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,8 @@ 2011-02-18 Eli Zaretskii + * files.texi (Visiting Functions): Document find-file-literally, + both the command and the variable. + * variables.texi (Creating Buffer-Local): Explain the meaning of permanent local variables. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 1f66da98347..fd9f3bb4648 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -114,6 +114,26 @@ When @code{find-file} is called interactively, it prompts for @var{filename} in the minibuffer. @end deffn +@deffn Command find-file-literally filename +This command visits @var{filename}, like @code{find-file} does, but it +does not perform any format conversions (@pxref{Format Conversion}), +character code conversions (@pxref{Coding Systems}), or end-of-line +conversions (@pxref{Coding System Basics, End of line conversion}). +The buffer visiting the file is made unibyte, and its major mode is +Fundamental mode, regardless of the file name. File local variable +specifications in the file (@pxref{File Local Variables}) are +ignored, and automatic decompression and adding a newline at the end +of the file due to @code{require-final-newline} (@pxref{Saving +Buffers, require-final-newline}) are also disabled. + +Note that if Emacs already has a buffer visiting the same file +non-literally, it will not visit the same file literally, but instead +just switch to the existing buffer. If you want to be sure of +accessing a file's contents literally, you should create a temporary +buffer and then read the file contents into it using +@code{insert-file-contents-literally} (@pxref{Reading from Files}). +@end deffn + @defun find-file-noselect filename &optional nowarn rawfile wildcards This function is the guts of all the file-visiting functions. It returns a buffer visiting the file @var{filename}. You may make the @@ -225,6 +245,16 @@ This is not a normal hook because the values of the functions are used, and in many cases only some of the functions are called. @end defvar +@defvar find-file-literally +This buffer-local variable, if set to a non-@code{nil} value, makes +@code{save-buffer} behave as if the buffer were visiting its file +literally, i.e. without conversions of any kind. The command +@code{find-file-literally} sets this variable's local value, but other +equivalent functions and commands can do that as well, e.g.@: to avoid +automatic addition of a newline at the end of the file. This variable +us permanent local, so it is unaffected by changes of major modes. +@end defvar + @node Subroutines of Visiting @comment node-name, next, previous, up @subsection Subroutines of Visiting From 0c973505c801cdca54397082820f4377ce159820 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 15:57:53 +0200 Subject: [PATCH 09/18] Synchronize @dircategory directives in doc/misc with info/dir. ada-mode.texi: Sync @dircategory with ../../info/dir. auth.texi: Sync @dircategory with ../../info/dir. autotype.texi: Sync @dircategory with ../../info/dir. calc.texi: Sync @dircategory with ../../info/dir. cc-mode.texi: Sync @dircategory with ../../info/dir. cl.texi: Sync @dircategory with ../../info/dir. dbus.texi: Sync @dircategory with ../../info/dir. dired-x.texi: Sync @dircategory with ../../info/dir. ebrowse.texi: Sync @dircategory with ../../info/dir. ede.texi: Sync @dircategory with ../../info/dir. ediff.texi: Sync @dircategory with ../../info/dir. edt.texi: Sync @dircategory with ../../info/dir. eieio.texi: Sync @dircategory with ../../info/dir. emacs-mime.texi: Sync @dircategory with ../../info/dir. epa.texi: Sync @dircategory with ../../info/dir. erc.texi: Sync @dircategory with ../../info/dir. eshell.texi: Sync @dircategory with ../../info/dir. eudc.texi: Sync @dircategory with ../../info/dir. flymake.texi: Sync @dircategory with ../../info/dir. forms.texi: Sync @dircategory with ../../info/dir. gnus.texi: Sync @dircategory with ../../info/dir. idlwave.texi: Sync @dircategory with ../../info/dir. mairix-el.texi: Sync @dircategory with ../../info/dir. message.texi: Sync @dircategory with ../../info/dir. mh-e.texi: Sync @dircategory with ../../info/dir. newsticker.texi: Sync @dircategory with ../../info/dir. nxml-mode.texi: Sync @dircategory with ../../info/dir. org.texi: Sync @dircategory with ../../info/dir. pcl-cvs.texi: Sync @dircategory with ../../info/dir. pgg.texi: Sync @dircategory with ../../info/dir. rcirc.texi: Sync @dircategory with ../../info/dir. reftex.texi: Sync @dircategory with ../../info/dir. remember.texi: Sync @dircategory with ../../info/dir. sasl.texi: Sync @dircategory with ../../info/dir. sc.texi: Sync @dircategory with ../../info/dir. semantic.texi: Sync @dircategory with ../../info/dir. ses.texi: Sync @dircategory with ../../info/dir. sieve.texi: Sync @dircategory with ../../info/dir. smtpmail.texi: Sync @dircategory with ../../info/dir. speedbar.texi: Sync @dircategory with ../../info/dir. trampver.texi [emacs]: Set emacsname to "Emacs". tramp.texi: Sync @dircategory with ../../info/dir. url.texi: Sync @dircategory with ../../info/dir. vip.texi: Sync @dircategory with ../../info/dir. viper.texi: Sync @dircategory with ../../info/dir. widget.texi: Sync @dircategory with ../../info/dir. woman.texi: Sync @dircategory with ../../info/dir. --- doc/misc/ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++++ doc/misc/ada-mode.texi | 2 +- doc/misc/auth.texi | 2 +- doc/misc/autotype.texi | 2 +- doc/misc/calc.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/cl.texi | 2 +- doc/misc/dbus.texi | 2 +- doc/misc/dired-x.texi | 2 +- doc/misc/ebrowse.texi | 2 +- doc/misc/ede.texi | 2 +- doc/misc/ediff.texi | 2 +- doc/misc/edt.texi | 2 +- doc/misc/eieio.texi | 2 +- doc/misc/emacs-mime.texi | 2 +- doc/misc/epa.texi | 2 +- doc/misc/erc.texi | 2 +- doc/misc/eshell.texi | 2 +- doc/misc/eudc.texi | 2 +- doc/misc/flymake.texi | 2 +- doc/misc/forms.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/idlwave.texi | 2 +- doc/misc/mairix-el.texi | 2 +- doc/misc/message.texi | 2 +- doc/misc/mh-e.texi | 2 +- doc/misc/newsticker.texi | 2 +- doc/misc/nxml-mode.texi | 2 +- doc/misc/org.texi | 2 +- doc/misc/pcl-cvs.texi | 2 +- doc/misc/pgg.texi | 2 +- doc/misc/rcirc.texi | 2 +- doc/misc/reftex.texi | 2 +- doc/misc/remember.texi | 2 +- doc/misc/sasl.texi | 2 +- doc/misc/sc.texi | 2 +- doc/misc/semantic.texi | 2 +- doc/misc/ses.texi | 2 +- doc/misc/sieve.texi | 2 +- doc/misc/smtpmail.texi | 2 +- doc/misc/speedbar.texi | 2 +- doc/misc/tramp.texi | 2 +- doc/misc/trampver.texi | 2 +- doc/misc/url.texi | 2 +- doc/misc/vip.texi | 2 +- doc/misc/viper.texi | 2 +- doc/misc/widget.texi | 2 +- doc/misc/woman.texi | 2 +- 48 files changed, 97 insertions(+), 47 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 172c6187673..8d1c5dc46ab 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,53 @@ +2011-02-18 Eli Zaretskii + + * ada-mode.texi: Sync @dircategory with ../../info/dir. + * auth.texi: Sync @dircategory with ../../info/dir. + * autotype.texi: Sync @dircategory with ../../info/dir. + * calc.texi: Sync @dircategory with ../../info/dir. + * cc-mode.texi: Sync @dircategory with ../../info/dir. + * cl.texi: Sync @dircategory with ../../info/dir. + * dbus.texi: Sync @dircategory with ../../info/dir. + * dired-x.texi: Sync @dircategory with ../../info/dir. + * ebrowse.texi: Sync @dircategory with ../../info/dir. + * ede.texi: Sync @dircategory with ../../info/dir. + * ediff.texi: Sync @dircategory with ../../info/dir. + * edt.texi: Sync @dircategory with ../../info/dir. + * eieio.texi: Sync @dircategory with ../../info/dir. + * emacs-mime.texi: Sync @dircategory with ../../info/dir. + * epa.texi: Sync @dircategory with ../../info/dir. + * erc.texi: Sync @dircategory with ../../info/dir. + * eshell.texi: Sync @dircategory with ../../info/dir. + * eudc.texi: Sync @dircategory with ../../info/dir. + * flymake.texi: Sync @dircategory with ../../info/dir. + * forms.texi: Sync @dircategory with ../../info/dir. + * gnus.texi: Sync @dircategory with ../../info/dir. + * idlwave.texi: Sync @dircategory with ../../info/dir. + * mairix-el.texi: Sync @dircategory with ../../info/dir. + * message.texi: Sync @dircategory with ../../info/dir. + * mh-e.texi: Sync @dircategory with ../../info/dir. + * newsticker.texi: Sync @dircategory with ../../info/dir. + * nxml-mode.texi: Sync @dircategory with ../../info/dir. + * org.texi: Sync @dircategory with ../../info/dir. + * pcl-cvs.texi: Sync @dircategory with ../../info/dir. + * pgg.texi: Sync @dircategory with ../../info/dir. + * rcirc.texi: Sync @dircategory with ../../info/dir. + * reftex.texi: Sync @dircategory with ../../info/dir. + * remember.texi: Sync @dircategory with ../../info/dir. + * sasl.texi: Sync @dircategory with ../../info/dir. + * sc.texi: Sync @dircategory with ../../info/dir. + * semantic.texi: Sync @dircategory with ../../info/dir. + * ses.texi: Sync @dircategory with ../../info/dir. + * sieve.texi: Sync @dircategory with ../../info/dir. + * smtpmail.texi: Sync @dircategory with ../../info/dir. + * speedbar.texi: Sync @dircategory with ../../info/dir. + * trampver.texi [emacs]: Set emacsname to "Emacs". + * tramp.texi: Sync @dircategory with ../../info/dir. + * url.texi: Sync @dircategory with ../../info/dir. + * vip.texi: Sync @dircategory with ../../info/dir. + * viper.texi: Sync @dircategory with ../../info/dir. + * widget.texi: Sync @dircategory with ../../info/dir. + * woman.texi: Sync @dircategory with ../../info/dir. + 2011-02-14 Glenn Morris * dired-x.texi: Drop meaningless version number. diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index fdb0bccc29d..9f4fd44f467 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -20,7 +20,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * Ada mode: (ada-mode). Emacs mode for editing and compiling Ada code. @end direntry diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 7acb45c9381..f08acb39d9c 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -29,7 +29,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Auth-source: (auth). The Emacs auth-source library. @end direntry diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 4c2335a8b50..7f9dd0daa02 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -27,7 +27,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Autotype: (autotype). Convenient features for text that you enter frequently in Emacs. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index b878e471900..0a595d90b80 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -110,7 +110,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Calc: (calc). Advanced desk calculator and mathematical tool. @end direntry diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index e80307a2de1..4b56e072264 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -179,7 +179,7 @@ developing GNU and promoting software freedom.'' @comment Info directory entry for use by install-info. The indentation @comment here is by request from the FSF folks. -@dircategory Emacs +@dircategory Emacs editing modes @direntry * CC Mode: (ccmode). Emacs mode for editing C, C++, Objective-C, Java, Pike, AWK, and CORBA IDL code. diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index d36b0300be5..6bdc494a1a5 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -22,7 +22,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * CL: (cl). Partial Common Lisp support for Emacs Lisp. @end direntry diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 5a10550f600..b58fbcb22ae 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -22,7 +22,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * D-Bus: (dbus). Using D-Bus in Emacs. @end direntry diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index a31a3dac319..fada13faf15 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -34,7 +34,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Dired-X: (dired-x). Dired Extra Features. @end direntry diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index a4278f05c69..58b04dc7b83 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -27,7 +27,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Ebrowse: (ebrowse). A C++ class browser for Emacs. @end direntry diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 267a2bed84c..a9fbf2a5f5c 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -22,7 +22,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * ede: (ede). Project management for Emacs. @end direntry diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index a8b8da9e5d5..8774fae5067 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -42,7 +42,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Ediff: (ediff). A visual interface for comparing and merging programs. @end direntry diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index 9997326b1d0..d5a28481352 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -23,7 +23,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * EDT: (edt). An Emacs emulation of the EDT editor. @end direntry diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index ea5d2e478f0..8303d4eef2b 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -27,7 +27,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * eieio: (eieio). Objects for Emacs. @end direntry diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index a2080125c3f..6121f1afd75 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -29,7 +29,7 @@ developing GNU and promoting software freedom.'' @c Node ``Interface Functions'' uses Latin-1 characters @documentencoding ISO-8859-1 -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Emacs MIME: (emacs-mime). Emacs MIME de/composition library. @end direntry diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index 7e49b8dc801..e6402fb83f5 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * EasyPG Assistant: (epa). An Emacs user interface to GNU Privacy Guard. @end direntry diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index 0d87d7d315a..8056845e4d3 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -28,7 +28,7 @@ and modified without restriction. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * ERC: (erc). Powerful and extensible IRC client for Emacs. @end direntry diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 732ed253875..25ba50d616e 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Eshell: (eshell). A command shell implemented in Emacs Lisp. @end direntry diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index f018fdf8590..cf40bcce73d 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -29,7 +29,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * EUDC: (eudc). Emacs client for directory servers (LDAP, PH). @end direntry diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index bdbbee1b640..75a660f040e 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -28,7 +28,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Flymake: (flymake). A universal on-the-fly syntax checker. @end direntry diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index fc809db576f..1ac00e6ace4 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -35,7 +35,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Forms: (forms). Emacs package for editing data bases by filling in forms. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 55d918dd7e8..6cd603d9d0a 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -320,7 +320,7 @@ developing GNU and promoting software freedom.'' @end iflatex @end iftex -@dircategory Emacs +@dircategory Emacs network features @direntry * Gnus: (gnus). The newsreader Gnus. @end direntry diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 2e8aa8a0280..02924d7472f 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -39,7 +39,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * IDLWAVE: (idlwave). Major mode and shell for IDL files. @end direntry diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index dc391bd430a..ff5cd922ea9 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -22,7 +22,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Mairix: (mairix-el). Emacs interface to the Mairix mail indexer. @end direntry diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 86bc70ba0f0..cc174333261 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Message: (message). Mail and news composition mode that goes with Gnus. diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index dd48306b032..a0ab0d7a4f9 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -56,7 +56,7 @@ Public License.'' @end copying @c Info Directory Entry -@dircategory Emacs +@dircategory Emacs network features @direntry * MH-E: (mh-e). Emacs interface to the MH mail system. @end direntry diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index 5f65522e9b6..f01fe23a6eb 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -30,7 +30,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Newsticker: (newsticker). A Newsticker for Emacs. @end direntry diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index 9d1e5cad047..9ed8bcf88d0 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi @@ -31,7 +31,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * nXML Mode: (nxml-mode). XML editing mode with RELAX NG support. @end direntry diff --git a/doc/misc/org.texi b/doc/misc/org.texi index b20e1c6ce03..b42de909d08 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -66,7 +66,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * Org Mode: (org). Outline-based notes management and organizer. @end direntry diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 909c0e3507c..e466a3bec8f 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -24,7 +24,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * PCL-CVS: (pcl-cvs). Emacs front-end to CVS. @end direntry diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 0637484c5b6..daef19a01b5 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * PGG: (pgg). Emacs interface to various PGP implementations. @end direntry diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index 43933996994..c8c341534fe 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -22,7 +22,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Rcirc: (rcirc). Internet Relay Chat (IRC) client. @end direntry diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index 73f40c2559b..c5cb511c06d 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -44,7 +44,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * RefTeX: (reftex). Emacs support for LaTeX cross-references and citations. diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index 58d50c97149..bdaf4750d97 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Remember: (remember). Simple information manager for Emacs. @end direntry diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index f18caf12b84..a75f2d80f64 100644 --- a/doc/misc/sasl.texi +++ b/doc/misc/sasl.texi @@ -30,7 +30,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * SASL: (sasl). The Emacs SASL library. @end direntry diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 8ac2a9a2dcd..d4f45fb6b93 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -33,7 +33,7 @@ developing GNU and promoting software freedom.'' @c @smallbook -@dircategory Emacs +@dircategory Emacs network features @direntry * SC: (sc). Supercite lets you cite parts of messages you're replying to, in flexible ways. diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 87ca1224516..eb84a096f28 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -41,7 +41,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Semantic: (semantic). Source code parser library and utilities. @end direntry diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 94ef50e4348..6a1cbe6203c 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -28,7 +28,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * SES: (ses). Simple Emacs Spreadsheet. @end direntry diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index 12284b09fda..139d0fa77dd 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs network features @direntry * Sieve: (sieve). Managing Sieve scripts in Emacs. @end direntry diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index b59c8ab5808..40dcf6bc926 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -20,7 +20,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * SMTP: (smtpmail). Emacs library for sending mail via SMTP. @end direntry diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 88c293e67f1..3e0373d0440 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -21,7 +21,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Speedbar: (speedbar). File/Tag summarizing utility. @end direntry diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index b3b69e0696a..8a7cbf6a69d 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -55,7 +55,7 @@ supports it in developing GNU and promoting software freedom.'' @end copying @c Entries for @command{install-info} to use -@dircategory @value{emacsname} +@dircategory @value{emacsname} network features @direntry * TRAMP: (tramp). Transparent Remote Access, Multiple Protocol @value{emacsname} remote file access via rsh and rcp. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 582f0a8bc20..3cde3eb4bfc 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -44,7 +44,7 @@ @c Emacs values. @ifset emacs -@set emacsname GNU Emacs +@set emacsname Emacs @set emacsdir emacs @set ftppackagename Ange-FTP @set prefix / diff --git a/doc/misc/url.texi b/doc/misc/url.texi index b8b8f67204b..7e65e5c8675 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -12,7 +12,7 @@ \overfullrule=0pt %\global\baselineskip 30pt % for printing in double space @end tex -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * URL: (url). URL loading package. @end direntry diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index c136070a412..539f6fe2c35 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -36,7 +36,7 @@ developing GNU and promoting software freedom.'' @finalout @contents -@dircategory Emacs +@dircategory Emacs misc features @direntry * VIP: (vip). An older VI-emulation for Emacs. @end direntry diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 1b087559e86..0482f78ba15 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -24,7 +24,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * VIPER: (viper). The newest Emacs VI-emulation mode. (also, A VI Plan for Emacs Rescue diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index 275da073a9f..ac111870f3e 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -25,7 +25,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs lisp libraries @direntry * Widget: (widget). The "widget" package used by the Emacs Customization facility. diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index 9c2643ba4eb..975a9c408fc 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -35,7 +35,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man". @end direntry From a167e505d53ca8a971e38fd85f757ca2e2cebda8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 17:43:22 +0200 Subject: [PATCH 10/18] Document *SUBSTRING completion for Unicode character names. international/mule-cmds.el (read-char-by-name, ucs-insert): Document completion with asterisk and a substring. --- lisp/ChangeLog | 5 +++++ lisp/international/mule-cmds.el | 25 ++++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cdf6dbf4944..da5b9ebbda2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-18 Eli Zaretskii + + * international/mule-cmds.el (read-char-by-name, ucs-insert): + Document completion with asterisk and a substring. + 2011-02-18 Glenn Morris * files.el (find-file-literally): Doc fix. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index fed7e6ec9b1..0ca4a740586 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2934,11 +2934,19 @@ on encoding." (defun read-char-by-name (prompt) "Read a character by its Unicode name or hex number string. Display PROMPT and read a string that represents a character by its -Unicode property `name' or `old-name'. You can type a few of first -letters of the Unicode name and use completion. This function also -accepts a hexadecimal number of Unicode code point or a number in -hash notation, e.g. #o21430 for octal, #x2318 for hex, or #10r8984 -for decimal. Returns a character as a number." +Unicode property `name' or `old-name'. + +This function returns the character as a number. + +You can type a few of the first letters of the Unicode name and +use completion. If you type a substring of the Unicode name +preceded by an asterisk `*' and use completion, it will show all +the characters whose names include that substring, not necessarily +at the beginning of the name. + +This function also accepts a hexadecimal number of Unicode code +point or a number in hash notation, e.g. #o21430 for octal, +#x2318 for hex, or #10r8984 for decimal." (let* ((completion-ignore-case t) (input (completing-read prompt ucs-completions))) (cond @@ -2953,6 +2961,13 @@ for decimal. Returns a character as a number." "Insert COUNT copies of CHARACTER of the given Unicode code point. Interactively, prompts for a Unicode character name or a hex number using `read-char-by-name'. + +You can type a few of the first letters of the Unicode name and +use completion. If you type a substring of the Unicode name +preceded by an asterisk `*' and use completion, it will show all +the characters whose names include that substring, not necessarily +at the beginning of the name. + The optional third arg INHERIT (non-nil when called interactively), says to inherit text properties from adjoining text, if those properties are sticky." From 61aa93ed0d083435c6fef9ab85d5776f233376e1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 19:51:15 +0200 Subject: [PATCH 11/18] Fix bug #8047 with require-final-newline and image file display. image-mode.el (image-toggle-display-image): Disable require-final-newline in buffers visiting binary image files. --- lisp/ChangeLog | 4 ++++ lisp/image-mode.el | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index da5b9ebbda2..8caa24c1f40 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-02-18 Eli Zaretskii + * image-mode.el (image-toggle-display-image): Disable + require-final-newline in buffers visiting binary image files. + (Bug#8047) + * international/mule-cmds.el (read-char-by-name, ucs-insert): Document completion with asterisk and a substring. diff --git a/lisp/image-mode.el b/lisp/image-mode.el index b30a43080d6..191e347330d 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -507,6 +507,11 @@ was inserted." ;; This just makes the arrow displayed in the right fringe ;; area look correct when the image is wider than the window. (setq truncate-lines t) + ;; Disable adding a newline at the end of the image file when it + ;; is written with, e.g., C-x C-w. + (if (coding-system-equal (coding-system-base buffer-file-coding-system) + 'no-conversion) + (set (make-local-variable 'require-final-newline) nil)) ;; Allow navigation of large images (set (make-local-variable 'auto-hscroll-mode) nil) (setq image-type type) From e979a521f3dee5333545d96d9ff2934756a583c8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 21:03:59 +0200 Subject: [PATCH 12/18] Followup for fixing bug #7942. doc/lispref/elisp.texi: Sync @dircategory with ../../info/dir. doc/lispintro/emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir. doc/misc/ede.texi: Sync letter-case with ../../info/dir. --- doc/lispintro/ChangeLog | 4 ++++ doc/lispintro/emacs-lisp-intro.texi | 2 +- doc/lispref/ChangeLog | 2 ++ doc/lispref/elisp.texi | 2 +- doc/misc/ede.texi | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index b77431f3313..19bb3195d66 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Eli Zaretskii + + * emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir. + 2010-09-21 Glenn Morris * cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps: diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 5a0b5693b14..4cce412b225 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -216,7 +216,7 @@ @c ---------------------------------------------------- -@dircategory Emacs +@dircategory GNU Emacs Lisp @direntry * Emacs Lisp Intro: (eintr). A simple introduction to Emacs Lisp programming. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8673ed51907..9be1104a256 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2011-02-18 Eli Zaretskii + * elisp.texi: Sync @dircategory with ../../info/dir. + * files.texi (Visiting Functions): Document find-file-literally, both the command and the variable. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index aef8229e4b4..cfc02a07068 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -63,7 +63,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory GNU Emacs Lisp @direntry * Elisp: (elisp). The Emacs Lisp Reference Manual. @end direntry diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index a9fbf2a5f5c..1bc27c43c46 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -24,7 +24,7 @@ developing GNU and promoting software freedom.'' @dircategory Emacs misc features @direntry -* ede: (ede). Project management for Emacs. +* EDE: (ede). Project management for Emacs. @end direntry @titlepage From 2a3ae860f5f85bd11c1c6fde7fee59032ef9c4c6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 21:07:44 +0200 Subject: [PATCH 13/18] doc/misc/eieio.texi: More followup for bug #7942. --- doc/misc/eieio.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 8303d4eef2b..05a6d135cfb 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -29,7 +29,7 @@ developing GNU and promoting software freedom.'' @dircategory Emacs misc features @direntry -* eieio: (eieio). Objects for Emacs. +* EIEIO: (eieio). Objects for Emacs. @end direntry @titlepage From ec2027bfa34a72d3b2127341ded9059176191963 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 18 Feb 2011 21:11:04 +0200 Subject: [PATCH 14/18] Still more followup for bug #7942. --- doc/misc/ede.texi | 2 +- doc/misc/eieio.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 1bc27c43c46..57dc01d9fef 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -24,7 +24,7 @@ developing GNU and promoting software freedom.'' @dircategory Emacs misc features @direntry -* EDE: (ede). Project management for Emacs. +* EDE: (ede). The Emacs Development Environment. @end direntry @titlepage diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 05a6d135cfb..f36efff3a07 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -29,7 +29,7 @@ developing GNU and promoting software freedom.'' @dircategory Emacs misc features @direntry -* EIEIO: (eieio). Objects for Emacs. +* EIEIO: (eieio). An objects system for Emacs Lisp. @end direntry @titlepage From 8c62c205ff72c7d964ff574dc6f84f1b825ed263 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 18 Feb 2011 20:06:40 -0800 Subject: [PATCH 15/18] * doc/emacs/dired.texi (Dired): Dired-X version number was dropped. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/dired.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b89f9226c3b..9f45fa31cc2 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2011-02-19 Glenn Morris + + * dired.texi (Dired): Dired-X version number was dropped. + 2011-02-05 Chong Yidong * rmail.texi (Rmail Display): Document Rmail MIME support more diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 3d33006dcac..0b3cd7aac0e 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -24,7 +24,7 @@ files. You first mark certain files in order to operate on all of them with one command. The Dired-X package provides various extra features for Dired mode. -@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}. +@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}. You can also view a list of files in a directory with @kbd{C-x C-d} (@code{list-directory}). Unlike Dired, this command does not allow From 16bc9688d8ab5e237b2151bc9d16d0ad7f577519 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sat, 19 Feb 2011 18:22:24 +0900 Subject: [PATCH 16/18] Fix setting of buffer-file-coding-system for MIME message. --- lisp/ChangeLog | 8 ++++++++ lisp/mail/rmail.el | 2 +- lisp/mail/rmailmm.el | 16 +++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8caa24c1f40..e0c9f552c9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-02-19 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to + get the header copy into the temporary buffer. + (rmail-mime-insert-decoded-text): Ignore us-ascii. + (rmail-show-mime): When rmail-mime-coding-system is nil, set + buffer-file-coding-system to undecided. + 2011-02-18 Eli Zaretskii * image-mode.el (image-toggle-display-image): Disable diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 370999dabf8..fc4b642e8bb 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4287,7 +4287,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "7f6ad821b4543a18139fee9250beea5c") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "9c0902449733cabd5c7e7d17092a7c69") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index d6af925d461..e44dd877e4f 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -471,10 +471,11 @@ See `rmail-mime-entity' for the detail." HEADER is a header component of a MIME-entity object (see `rmail-mime-entity')." (with-temp-buffer - (let ((last-coding-system-used nil)) + (let ((buf (current-buffer))) (with-current-buffer rmail-mime-mbox-buffer - (let ((rmail-buffer rmail-mime-mbox-buffer) - (rmail-view-buffer rmail-mime-view-buffer)) + (let ((last-coding-system-used nil) + (rmail-buffer rmail-mime-mbox-buffer) + (rmail-view-buffer buf)) (save-excursion (goto-char (aref header 0)) (rmail-copy-headers (point) (aref header 1))))) @@ -513,7 +514,9 @@ HEADER is a header component of a MIME-entity object (see ((string= transfer-encoding "quoted-printable") (quoted-printable-decode-region pos (point)))))) (decode-coding-region pos (point) coding-system) - (if (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system)) + (if (and + (or (not rmail-mime-coding-system) (consp rmail-mime-coding-system)) + (not (eq (coding-system-base coding-system) 'us-ascii))) (setq rmail-mime-coding-system coding-system)) (or (bolp) (insert "\n")))) @@ -1301,7 +1304,10 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'." (rmail-mime-find-header-encoding (rmail-mime-entity-header entity))))) (set-buffer-file-coding-system - (coding-system-base rmail-mime-coding-system) t t)) + (if rmail-mime-coding-system + (coding-system-base rmail-mime-coding-system) + 'undecided) + t t)) ;; Decoding failed. ENTITY is an error message. Insert the ;; original message body as is, and show warning. (let ((region (with-current-buffer rmail-mime-mbox-buffer From f6ed3dbe85f0960cca1daa13cb8757225feb9bf3 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 19 Feb 2011 12:34:50 -0500 Subject: [PATCH 17/18] * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html --- src/ChangeLog | 4 ++++ src/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 68e9c76a437..3a356bb81aa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-02-19 Chong Yidong + + * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. + 2011-02-13 Eli Zaretskii * xdisp.c (redisplay_internal): Resynchronize `w' if the selected diff --git a/src/Makefile.in b/src/Makefile.in index e92f2bb3b85..7d936144583 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -979,7 +979,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre often contain options that have to do with using Emacs''s crt0, which are only good with temacs. */ prefix-args${EXEEXT}: prefix-args.o $(config_h) - $(CC) $(LDFLAGS) prefix-args.o -o prefix-args + $(CC) $(ALL_CFLAGS) $(LDFLAGS) prefix-args.o -o prefix-args #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) From 27ac6e7908c1d7b503ac5dca42a34ab9068d0864 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 19 Feb 2011 14:26:37 -0500 Subject: [PATCH 18/18] Fix typo in auth.texi (Bug#8068). --- doc/misc/auth.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index f08acb39d9c..5c555e81a78 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -214,7 +214,7 @@ string or a @code{nil} object. Currently only the modes ``login'' and @var{port} contains the protocol name (e.g. ``imap'') or a port number. It must be a string, corresponding to the port in the -users' netrc files. +user's netrc files. @example ;; IMAP example