auto upstream

14 files changed, 82 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 2720997a6c8..711971a61ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
+
+        * lisp/eshell/em-cmpl.el: Corrected "context-related help"
+        keybinding in commentary.
+
 2013-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Parallelize documentation builds.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 355d0b57be5..c4f45d02a05 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.texi (Magic File Names): Improve wording and indexing.
+
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
         * display.texi (Multi-Frame Images): Minor rephrasing.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index be44590f2ec..971e38f20b7 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2681,7 +2681,7 @@ no prefix argument is given, and @code{nil} otherwise.
 
   You can implement special handling for certain file names.  This is
 called making those names @dfn{magic}.  The principal use for this
-feature is in implementing remote file names (@pxref{Remote Files,,
+feature is in implementing access to remote files (@pxref{Remote Files,,
 Remote Files, emacs, The GNU Emacs Manual}).
 
   To define a kind of magic file name, you must supply a regular
@@ -2689,6 +2689,7 @@ expression to define the class of names (all those that match the
 regular expression), plus a handler that implements all the primitive
 Emacs file operations for file names that match.
 
+@cindex file handler
 @vindex file-name-handler-alist
   The variable @code{file-name-handler-alist} holds a list of handlers,
 together with regular expressions that determine when to apply each
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 9a4f4c10610..632f06d22b1 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        Port Tramp documentation to Texinfo 5.0.
+        * tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
+        (Filename Syntax): Do not use @trampfn{} in @item.
+        (Filename completion): Use @columnfractions in @multitable.
+
 2013-02-22  Glenn Morris  <rgm@gnu.org>
 
         * flymake.texi (Syntax check statuses): Fix multitable continued rows.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index f1dac493054..00b5e1e8dc1 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -20,20 +20,23 @@
 @c xxx and yyy are auxiliary macros in order to omit leading and
 @c trailing whitespace.  Not very elegant, but I don't know it better.
 
-@macro xxx {one}@c
-@set \one\@c
+@macro xxx {one}
+@set \one\
 @end macro
 
-@macro yyy {one, two}@c
+@macro yyy {one, two}
 @xxx{x\one\}@c
-@ifclear x@c
+@ifclear x
 \one\@w{}\two\@c
 @end ifclear
-@clear x\one\@c
+@clear x\one\
 @end macro
 
-@macro trampfn {method, user, host, localname}@c
-@value{prefix}@yyy{\method\,@value{postfixhop}}@yyy{\user\,@@}\host\@value{postfix}\localname\@c
+@macro trampfn {method, user, host, localname}
+@value{prefix}@c
+@yyy{\method\,@value{postfixhop}}@c
+@yyy{\user\,@@}@c
+\host\@value{postfix}\localname\
 @end macro
 
 @copying
@@ -2323,25 +2326,25 @@ using the default method.  @xref{Default Method}.
 Some examples of @value{tramp} filenames are shown below.
 
 @table @file
-@item @trampfn{, , melancholia, .emacs}
+@item @value{prefix}melancholia@value{postfix}.emacs
 Edit the file @file{.emacs} in your home directory on the machine
 @code{melancholia}.
 
-@item @trampfn{, , melancholia.danann.net, .emacs}
+@item @value{prefix}melancholia.danann.net@value{postfix}.emacs
 This edits the same file, using the fully qualified domain name of
 the machine.
 
-@item @trampfn{, , melancholia, ~/.emacs}
+@item @value{prefix}melancholia@value{postfix}~/.emacs
 This also edits the same file; the @file{~} is expanded to your
 home directory on the remote machine, just like it is locally.
 
-@item @trampfn{, , melancholia, ~daniel/.emacs}
+@item @value{prefix}melancholia@value{postfix}~daniel/.emacs
 This edits the file @file{.emacs} in the home directory of the user
 @code{daniel} on the machine @code{melancholia}.  The @file{~<user>}
 construct is expanded to the home directory of that user on the remote
 machine.
 
-@item @trampfn{, , melancholia, /etc/squid.conf}
+@item @value{prefix}melancholia@value{postfix}/etc/squid.conf
 This edits the file @file{/etc/squid.conf} on the machine
 @code{melancholia}.
 
@@ -2453,7 +2456,8 @@ If you, for example, type @kbd{C-x C-f @value{prefix}t
 @key{TAB}}, @value{tramp} might give you as result the choice for
 
 @example
-@multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}}
+@c @multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}}
+@multitable @columnfractions .5 .5
 @ifset emacs
 @item @value{prefixhop}telnet@value{postfixhop} @tab tmp/
 @item @value{prefixhop}toto@value{postfix} @tab
@@ -2480,7 +2484,8 @@ Next @kbd{@key{TAB}} brings you all machine names @value{tramp} detects in
 your @file{/etc/hosts} file, let's say
 
 @example
-@multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}}
+@multitable @columnfractions .5 .5
+@c @multitable {@trampfn{telnet, , melancholia.danann.net,}} {@trampfn{telnet, , 192.168.0.1,}}
 @item @trampfn{telnet, , 127.0.0.1,} @tab @trampfn{telnet, , 192.168.0.1,}
 @item @trampfn{telnet, , @value{ipv6prefix}::1@value{ipv6postfix},} @tab @trampfn{telnet, , localhost,}
 @item @trampfn{telnet, , melancholia.danann.net,} @tab @trampfn{telnet, , melancholia,}
diff --git a/etc/TODO b/etc/TODO
index b28888b7484..faa9fc4c98d 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -107,8 +107,6 @@ for users to customize.
 ** Distribute a bar cursor of width > 1 evenly between the two glyphs
    on each side of the bar (what to do at the edges?).
 
-** buffer-offer-save should be a permanent local.
-
 ** revert-buffer should eliminate overlays and the mark.
    For related problems consult the thread starting with
    http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg01346.html
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1897e48d715..d596d4f6fb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-24  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-ext.el (math-to-radians-2, math-from-radians-2):
+        Add option to force `pi' to remain symbolic.
+        * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan)
+        (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin)
+        (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the
+        derivatives, when necessary.
+
 2013-02-23  Peter Kleiweg  <p.c.j.kleiweg@rug.nl>
 
         * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i.
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 94b3f645785..3b845f563a1 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -777,18 +777,18 @@ If this can't be done, return NIL."
          (math-to-hms a 'rad))
         (t a)))
 
-(defun math-to-radians-2 (a)   ; [N N]
+(defun math-to-radians-2 (a &optional force-symbolic)   ; [N N]
   (cond ((eq (car-safe a) 'hms)
          (math-from-hms a 'rad))
         ((memq calc-angle-mode '(deg hms))
-         (if calc-symbolic-mode
+         (if (or calc-symbolic-mode force-symbolic)
              (math-div (math-mul a '(var pi var-pi)) 180)
            (math-mul a (math-pi-over-180))))
         (t a)))
 
-(defun math-from-radians-2 (a)   ; [N N]
+(defun math-from-radians-2 (a &optional force-symbolic)   ; [N N]
   (cond ((memq calc-angle-mode '(deg hms))
-         (if calc-symbolic-mode
+         (if (or calc-symbolic-mode force-symbolic)
              (math-div (math-mul 180 a) '(var pi var-pi))
            (math-div a (math-pi-over-180))))
         (t a)))
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index 58a82bcf143..cd962e7dbed 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -401,18 +401,18 @@
 
 (put 'calcFunc-sin\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2 (math-normalize
-                                               (list 'calcFunc-cos u))))))
+                                               (list 'calcFunc-cos u)) t))))
 
 (put 'calcFunc-cos\' 'math-derivative-1
      (function (lambda (u) (math-neg (math-to-radians-2
                                       (math-normalize
-                                       (list 'calcFunc-sin u)))))))
+                                       (list 'calcFunc-sin u)) t)))))
 
 (put 'calcFunc-tan\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2
                             (math-sqr
                              (math-normalize
-                              (list 'calcFunc-sec u)))))))
+                              (list 'calcFunc-sec u))) t))))
 
 (put 'calcFunc-sec\' 'math-derivative-1
      (function (lambda (u) (math-to-radians-2
@@ -420,7 +420,7 @@
                              (math-normalize
                               (list 'calcFunc-sec u))
                              (math-normalize
-                              (list 'calcFunc-tan u)))))))
+                              (list 'calcFunc-tan u))) t))))
 
 (put 'calcFunc-csc\' 'math-derivative-1
      (function (lambda (u) (math-neg
@@ -429,32 +429,32 @@
                               (math-normalize
                                (list 'calcFunc-csc u))
                               (math-normalize
-                               (list 'calcFunc-cot u))))))))
+                               (list 'calcFunc-cot u))) t)))))
 
 (put 'calcFunc-cot\' 'math-derivative-1
      (function (lambda (u) (math-neg
                             (math-to-radians-2
                              (math-sqr
                               (math-normalize
-                               (list 'calcFunc-csc u))))))))
+                               (list 'calcFunc-csc u))) t)))))
 
 (put 'calcFunc-arcsin\' 'math-derivative-1
      (function (lambda (u)
                  (math-from-radians-2
                   (math-div 1 (math-normalize
                                (list 'calcFunc-sqrt
-                                     (math-sub 1 (math-sqr u)))))))))
+                                     (math-sub 1 (math-sqr u))))) t))))
 
 (put 'calcFunc-arccos\' 'math-derivative-1
      (function (lambda (u)
                  (math-from-radians-2
                   (math-div -1 (math-normalize
                                 (list 'calcFunc-sqrt
-                                      (math-sub 1 (math-sqr u)))))))))
+                                      (math-sub 1 (math-sqr u))))) t))))
 
 (put 'calcFunc-arctan\' 'math-derivative-1
      (function (lambda (u) (math-from-radians-2
-                            (math-div 1 (math-add 1 (math-sqr u)))))))
+                            (math-div 1 (math-add 1 (math-sqr u))) t))))
 
 (put 'calcFunc-sinh\' 'math-derivative-1
      (function (lambda (u) (math-normalize (list 'calcFunc-cosh u)))))
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 8520a9c83d2..91311deffcf 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -63,7 +63,7 @@
 ;; The list of possible completions can be viewed at any point by
 ;; pressing <M-?>.
 ;;
-;; Finally, context-related help can be accessed by pressing <C-c i>.
+;; Finally, context-related help can be accessed by pressing <C-c M-h>.
 ;; This only works well if the completion function has provided Eshell
 ;; with sufficient pointers to locate the relevant help text.
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index d4764c08fde..5a7dfd82d28 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -87,6 +87,12 @@
 (require 'easymenu)
 (require 'registry)
 
+;; Silence XEmacs byte compiler, which will otherwise complain about
+;; call to `eieio-persistent-read'.
+(when (featurep 'xemacs)
+   (byte-compiler-options
+     (warnings (- callargs))))
+
 (defvar gnus-adaptive-word-syntax-table)
 
 (defvar gnus-registry-dirty t
diff --git a/src/ChangeLog b/src/ChangeLog
index cc8cb84831a..8d3fc1e56fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xdisp.c (set_message): Only check for debug-on-message if STRING
+        is a string.  (Bug#13797)
+
+2013-02-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix regression introduced by July 10 filelock.c patch.
+        * filelock.c (fill_in_lock_file_name): Fix crash caused by the
+        2012-07-10 patch to this file.  Reported by Eli Zaretskii in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
+        and diagnosed by Andreas Schwab in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
+
 2013-02-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Assume C89 or better.
diff --git a/src/filelock.c b/src/filelock.c
index 228fe98e8c7..cd2cd2e53a2 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn)
   p[1] = '.';
   p[2] = '#';
 
-  p = p + length + 2;
+  p = lockfile + length + 2;
 
   while (lstat (lockfile, &st) == 0 && !S_ISLNK (st.st_mode))
     {
diff --git a/src/xdisp.c b/src/xdisp.c
index 7a329c5421b..83e3a06d21d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10579,6 +10579,7 @@ set_message (Lisp_Object string)
   help_echo_showing_p = 0;
 
   if (STRINGP (Vdebug_on_message)
+      && STRINGP (string)
       && fast_string_match (Vdebug_on_message, string) >= 0)
     call_debugger (list2 (Qerror, string));
 }