Mercurial > emacs
changeset 107279:6e3f2cca063f
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 16 Feb 2010 04:18:57 +0000 |
| parents | a47ad081a03c (current diff) 6a11e3b311d8 (diff) |
| children | 742c52095274 |
| files | |
| diffstat | 8 files changed, 50 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispintro/ChangeLog Mon Feb 15 21:54:07 2010 +0000 +++ b/doc/lispintro/ChangeLog Tue Feb 16 04:18:57 2010 +0000 @@ -1,3 +1,7 @@ +2010-02-16 Glenn Morris <rgm@gnu.org> + + * emacs-lisp-intro.texi: Fix typo in name of `find-tag' command. + 2010-02-01 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp-intro.texi (Text and Auto-fill, Mode Line):
--- a/doc/lispintro/emacs-lisp-intro.texi Mon Feb 15 21:54:07 2010 +0000 +++ b/doc/lispintro/emacs-lisp-intro.texi Tue Feb 16 04:18:57 2010 +0000 @@ -229,7 +229,8 @@ Edition @value{edition-number}, @value{update-date} @sp 1 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. @sp 1 @iftex @@ -4732,16 +4733,16 @@ @end ignore More generally, if you want to see a function in its original source -file, you can use the @code{find-tags} function to jump to it. -@code{find-tags} works with a wide variety of languages, not just +file, you can use the @code{find-tag} function to jump to it. +@code{find-tag} works with a wide variety of languages, not just Lisp, and C, and it works with non-programming text as well. For -example, @code{find-tags} will jump to the various nodes in the +example, @code{find-tag} will jump to the various nodes in the Texinfo source file of this document. -The @code{find-tags} function depends on `tags tables' that record +The @code{find-tag} function depends on `tags tables' that record the locations of the functions, variables, and other items to which -@code{find-tags} jumps. - -To use the @code{find-tags} command, type @kbd{M-.} (i.e., press the +@code{find-tag} jumps. + +To use the @code{find-tag} command, type @kbd{M-.} (i.e., press the period key while holding down the @key{META} key, or else type the @key{ESC} key and then type the period key), and then, at the prompt, type in the name of the function whose source code you want to see, @@ -4753,7 +4754,7 @@ @c !!! 22.1.1 tags table location in this paragraph @cindex TAGS table, specifying -@findex find-tags +@findex find-tag Depending on how the initial default values of your copy of Emacs are set, you may also need to specify the location of your `tags table', which is a file called @file{TAGS}. For example, if you are @@ -4778,7 +4779,7 @@ For more information, see @ref{etags, , Create Your Own @file{TAGS} File}. After you become more familiar with Emacs Lisp, you will find that you will -frequently use @code{find-tags} to navigate your way around source code; +frequently use @code{find-tag} to navigate your way around source code; and you will create your own @file{TAGS} tables. @cindex Library, as term for `file' @@ -18961,7 +18962,7 @@ on-line and as a typeset, printed book.) Go to the other on-line help that is part of GNU Emacs: the on-line -documentation for all functions and variables, and @code{find-tags}, +documentation for all functions and variables, and @code{find-tag}, the program that takes you to sources. Here is an example of how I explore the sources. Because of its name,
--- a/doc/misc/ChangeLog Mon Feb 15 21:54:07 2010 +0000 +++ b/doc/misc/ChangeLog Tue Feb 16 04:18:57 2010 +0000 @@ -1,3 +1,7 @@ +2010-02-16 Glenn Morris <rgm@gnu.org> + + * nxml-mode.texi (Commands for locating a schema): Fix keybinding. + 2010-02-05 Mark A. Hershberger <mah@everybody.org> * ede.texi, eieio.texi, semantic.texi: Use standard direntry format.
--- a/doc/misc/nxml-mode.texi Mon Feb 15 21:54:07 2010 +0000 +++ b/doc/misc/nxml-mode.texi Tue Feb 16 04:18:57 2010 +0000 @@ -512,7 +512,7 @@ you visit a file in nXML mode. However, if you have just created a new file and the schema cannot be inferred from the file-name, then this will not locate the right schema. In this case, you should insert the -start-tag of the root element and then use the command @kbd{C-c +start-tag of the root element and then use the command @kbd{C-c C-s C-a}, which reapplies the rules based on the current content of the document. It is usually not necessary to insert the complete start-tag; often just @samp{<@var{name}} is
--- a/lisp/ChangeLog Mon Feb 15 21:54:07 2010 +0000 +++ b/lisp/ChangeLog Tue Feb 16 04:18:57 2010 +0000 @@ -1,3 +1,8 @@ +2010-02-16 Glenn Morris <rgm@gnu.org> + + * textmodes/tex-mode.el (tex-bibtex-file): Expand the result of + tex-main-file before using it. (Bug#5562) + 2010-02-15 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/advice.el (ad-compile-function): Suppress byte-compiler
--- a/lisp/gnus/ChangeLog Mon Feb 15 21:54:07 2010 +0000 +++ b/lisp/gnus/ChangeLog Tue Feb 16 04:18:57 2010 +0000 @@ -1,3 +1,8 @@ +2010-02-16 Glenn Morris <rgm@gnu.org> + + * message.el (message-default-mail-headers): Change the default value + to ease the transition from mail-mode to message-mode. (Bug#5555) + 2010-01-17 Chong Yidong <cyd@stupidchicken.com> * message.el (message-mail): Just pass yank-action on to message-setup.
--- a/lisp/gnus/message.el Mon Feb 15 21:54:07 2010 +0000 +++ b/lisp/gnus/message.el Tue Feb 16 04:18:57 2010 +0000 @@ -1178,8 +1178,22 @@ :link '(custom-manual "(message)Message Headers") :type 'message-header-lines) -(defcustom message-default-mail-headers "" +(defcustom message-default-mail-headers + ;; Ease the transition from mail-mode to message-mode. See bugs#4431, 5555. + (concat (if (and (boundp 'mail-default-reply-to) + (stringp mail-default-reply-to)) + (format "Reply-to: %s\n" mail-default-reply-to) + "") + (if (and (boundp 'mail-self-blind) + mail-self-blind) + (format "BCC: %s\n" user-mail-address) + "") + (if (and (boundp 'mail-archive-file-name) + (stringp mail-archive-file-name)) + (format "FCC: %s\n" mail-archive-file-name) + "")) "*A string of header lines to be inserted in outgoing mails." + :version "23.2" :group 'message-headers :group 'message-mail :link '(custom-manual "(message)Mail Headers") @@ -2768,7 +2782,7 @@ ;;; Forbidden properties ;; ;; We use `after-change-functions' to keep special text properties -;; that interfer with the normal function of message mode out of the +;; that interfere with the normal function of message mode out of the ;; buffer. (defcustom message-strip-special-text-properties t
--- a/lisp/textmodes/tex-mode.el Mon Feb 15 21:54:07 2010 +0000 +++ b/lisp/textmodes/tex-mode.el Tue Feb 16 04:18:57 2010 +0000 @@ -921,8 +921,8 @@ ;; remaining warning from byte-compiling all of Emacs... (eval-when-compile (setq byte-compile-function-environment - (delq (assq 'tex-mode byte-compile-function-environment) - byte-compile-function-environment))) + (delq (assq 'tex-mode byte-compile-function-environment) + byte-compile-function-environment))) ;;;###autoload (defun tex-mode () @@ -2643,7 +2643,7 @@ (tex-kill-job) (tex-start-shell)) (let* (shell-dirtrack-verbose - (source-file (tex-main-file)) + (source-file (expand-file-name (tex-main-file))) (tex-out-file (tex-append (file-name-nondirectory source-file) "")) (file-dir (file-name-directory source-file)))