from trunk

12 files changed, 99 insertions, 44 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index c22d7523fa0..e683cc1054f 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -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):
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 5efbb81ee1b..a785f964660 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -229,7 +229,8 @@ people who are not programmers.
 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 @@ definition.
 @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.
+@code{find-tag} jumps.
 
-To use the @code{find-tags} command, type @kbd{M-.}  (i.e., press the
+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 @@ screen.  To switch back to your current buffer, type @kbd{C-x b
 
 @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 @@ M-x compile RET etags *.el RET
 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 @@ introduction, it comes as a Texinfo source file, so you can read it
 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,
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9560073251b..7c9dd36e953 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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.
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 2dc36588350..c1ea64fe9a9 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -512,7 +512,7 @@ The rules for locating a schema are applied automatically when
 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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 681af61a897..0dbc97c0df8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,27 @@
         (skkdic-convert-okuri-ari): Ignore lines starting with '>'.
         (skkdic-convert): Use `euc-japan' coding system for writing.
 
+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
+        warnings, since it is annoying for the user to see them each time he
+        runs the code.
+
+2010-02-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-process-actions, tramp-read-passwd):
+        * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection): Use VEC
+        instead of PROC for caching "first-password-request".  Otherwise,
+        new processes would not profit from passwords already entered.
+
+        * net/tramp-cache.el (tramp-dump-connection-properties):
+        Don't save "first-password-request" property.
+
 2010-02-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * outline.el (outline-head-from-level):
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 003f70ea4a5..17f2ed53ba5 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2685,7 +2685,9 @@ For that it has to be fbound with a non-autoload definition."
       (ad-with-auto-activation-disabled
        (require 'bytecomp)
        (let ((symbol (make-symbol "advice-compilation"))
-             (byte-compile-warnings byte-compile-warnings))
+             (byte-compile-warnings byte-compile-warnings)
+             ;; Don't pop up windows showing byte-compiler warnings.
+             (warning-suppress-types '((bytecomp))))
          (if (featurep 'cl)
              (byte-compile-disable-warning 'cl-functions))
          (fset symbol (symbol-function function))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1c1c62bb1b0..a6d5f2040fe 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7194813422a..3a8c104b8e5 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1178,8 +1178,22 @@ these lines."
   :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 @@ PGG manual, depending on the value of `mml2015-use'."
 ;;; 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
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 4338a6edad1..ac86fabe3a9 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -1,7 +1,7 @@
 ;;; tramp-cache.el --- file information caching for Tramp
 
-;; Copyright (C) 2000, 2005, 2006, 2007, 2008,
-;;   2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2005, 2006, 2007, 2008, 2009,
+;;   2010 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@inanna.danann.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
@@ -295,7 +295,8 @@ KEY identifies the connection, it is either a process or a vector."
               (if (and (vectorp key) (not (tramp-file-name-localname key)))
                   (progn
                     (remhash "process-name" value)
-                    (remhash "process-buffer" value))
+                    (remhash "process-buffer" value)
+                    (remhash "first-password-request" value))
                 (remhash key cache)))
            cache)
           ;; Dump it.
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 3f1e1a463d3..a80e0f27752 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1057,8 +1057,7 @@ connection if a previous connection has died for some reason."
          vec 3 "Opening connection for %s@%s using %s..." user host method))
 
       ;; Enable auth-sorce and password-cache.
-      (tramp-set-connection-property
-       (tramp-get-connection-process vec) "first-password-request" t)
+      (tramp-set-connection-property vec "first-password-request" t)
 
       ;; There will be a callback of "askPassword", when a password is
       ;; needed.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a573a75afe2..e59383e31e7 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6539,7 +6539,7 @@ The terminal type can be configured with `tramp-terminal-type'."
 (defun tramp-process-actions (proc vec actions &optional timeout)
   "Perform actions until success or TIMEOUT."
   ;; Enable auth-source and password-cache.
-  (tramp-set-connection-property proc "first-password-request" t)
+  (tramp-set-connection-property vec "first-password-request" t)
   (let (exit)
     (while (not exit)
       (tramp-message proc 3 "Waiting for prompts from remote shell")
@@ -8320,26 +8320,27 @@ Invokes `password-read' if available, `read-passwd' else."
               (with-current-buffer (process-buffer proc)
                 (tramp-check-for-regexp proc tramp-password-prompt-regexp)
                 (format "%s for %s " (capitalize (match-string 1)) key)))))
-    (prog1
-        (or
-         ;; See if auth-sources contains something useful, if it's bound.
-         (and (boundp 'auth-sources)
-              (tramp-get-connection-property proc "first-password-request" nil)
-              ;; Try with Tramp's current method.
-              (funcall (symbol-function 'auth-source-user-or-password)
-                       "password" tramp-current-host tramp-current-method))
-         ;; Try the password cache.
-         (when (functionp 'password-read)
-           (unless (tramp-get-connection-property
-                    proc "first-password-request" nil)
-             (funcall (symbol-function 'password-cache-remove) key))
-           (let ((password
-                  (funcall (symbol-function 'password-read) pw-prompt key)))
-             (funcall (symbol-function 'password-cache-add) key password)
-             password))
-         ;; Else, get the password interactively.
-         (read-passwd pw-prompt))
-      (tramp-set-connection-property proc "first-password-request" nil))))
+    (with-parsed-tramp-file-name key nil
+      (prog1
+          (or
+           ;; See if auth-sources contains something useful, if it's bound.
+           (and (boundp 'auth-sources)
+                (tramp-get-connection-property v "first-password-request" nil)
+                ;; Try with Tramp's current method.
+                (funcall (symbol-function 'auth-source-user-or-password)
+                         "password" tramp-current-host tramp-current-method))
+           ;; Try the password cache.
+           (when (functionp 'password-read)
+             (unless (tramp-get-connection-property
+                      v "first-password-request" nil)
+               (funcall (symbol-function 'password-cache-remove) key))
+             (let ((password
+                    (funcall (symbol-function 'password-read) pw-prompt key)))
+               (funcall (symbol-function 'password-cache-add) key password)
+               password))
+           ;; Else, get the password interactively.
+           (read-passwd pw-prompt))
+        (tramp-set-connection-property v "first-password-request" nil)))))
 
 (defun tramp-clear-passwd (vec)
   "Clear password cache for connection related to VEC."
@@ -8585,7 +8586,7 @@ Only works for Bourne-like shells."
 ;;   rsync).
 ;; * Keep a second connection open for out-of-band methods like scp or
 ;;   rsync.
-;; * Support ptys in `tramp-handle-start-file-process'.
+;; * Support ptys in `tramp-handle-start-file-process'.  (Bug#4604)
 ;; * IMHO, it's a drawback that currently Tramp doesn't support
 ;;   Unicode in Dired file names by default.  Is it possible to
 ;;   improve Tramp to set LC_ALL to "C" only for commands where Tramp
@@ -8596,6 +8597,9 @@ Only works for Bourne-like shells."
 ;; * Load Tramp subpackages only when needed.  (Bug#1529, Bug#5448)
 ;; * Try telnet+curl as new method.  It might be useful for busybox,
 ;;   without built-in uuencode/uudecode.
+;; * Let `shell-dynamic-complete-*' and `comint-dynamic-complete' work
+;;   on remote hosts.
+;; * Use secrets.el for password handling.
 
 ;; Functions for file-name-handler-alist:
 ;; diff-latest-backup-file -- in diff.el
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index f2367caf66e..38698af7885 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -921,8 +921,8 @@ Inherits `shell-mode-map' with a few additions.")
 ;; 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 @@ Runs the shell command defined by `tex-show-queue-command'."
       (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)))