auto upstream

11 files changed, 102 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index dc6c0bfc3ec..5f74726a743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-dist: Do not distribute admin/unidata/Makefile.
+        It is generated by 'configure'.
+
+        * build-aux/update-subdirs: Don't leave subdirs.el~ behind.
+        It messes up 'make distclean', and contains no useful information
+        because it's a copy of subdirs.el.
+
 2013-04-18  John Marino  <gnugcc@marino.st>  (tiny change)
 
         * configure.ac: Add DragonFly BSD, mostly same as FreeBSD.  (Bug#14068)
diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs
index 8fdf1609e6f..3c429b8b5e4 100755
--- a/build-aux/update-subdirs
+++ b/build-aux/update-subdirs
@@ -49,8 +49,8 @@ else
 ;; no-byte-compile: t
 ;; End:" > subdirs.el~
   if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
-    :; # echo "subdirs.el unchanged";
+    rm subdirs.el~
   else
-  mv subdirs.el~ subdirs.el
+    mv subdirs.el~ subdirs.el
   fi
 fi
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 93084e76203..1f27775442c 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * emacs-lisp-intro.texi (defcustom, defun)
+        (simplified-beginning-of-buffer, defvar, Building Robots, Review)
+        (save-excursion): `defun' and `defcustom' are now macros rather
+        than special forms. (Bug#13853)
+
 2013-03-16  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index c42ed210cbc..3147960fbc3 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -37,6 +37,7 @@
 
 @set edition-number 3.10
 @set update-date 28 October 2009
+@c FIXME can this be updated?  -- xfq
 
 @ignore
  ## Summary of shell commands to create various output formats:
@@ -3094,18 +3095,15 @@ unless you investigate, you won't know whether an already-written
 function is written in Emacs Lisp or C.
 
 @node defun
-@section The @code{defun} Special Form
+@section The @code{defun} Macro
 @findex defun
-@cindex Special form of @code{defun}
 
 @cindex @samp{function definition} defined
 In Lisp, a symbol such as @code{mark-whole-buffer} has code attached to
 it that tells the computer what to do when the function is called.
 This code is called the @dfn{function definition} and is created by
 evaluating a Lisp expression that starts with the symbol @code{defun}
-(which is an abbreviation for @emph{define function}).  Because
-@code{defun} does not evaluate its arguments in the usual way, it is
-called a @dfn{special form}.
+(which is an abbreviation for @emph{define function}).
 
 In subsequent sections, we will look at function definitions from the
 Emacs source code, such as @code{mark-whole-buffer}.  In this section,
@@ -4254,7 +4252,7 @@ On the other hand, this function returns @code{nil} if the test is false.
 @findex point
 @findex mark
 
-The @code{save-excursion} function is the fourth and final special form
+The @code{save-excursion} function is the third and final special form
 that we will discuss in this chapter.
 
 In Emacs Lisp programs used for editing, the @code{save-excursion}
@@ -4381,9 +4379,9 @@ within the body of a @code{let} expression.  It looks like this:
 @node Review
 @section Review
 
-In the last few chapters we have introduced a fair number of functions
-and special forms.  Here they are described in brief, along with a few
-similar functions that have not been mentioned yet.
+In the last few chapters we have introduced a macro and a fair number
+of functions and special forms.  Here they are described in brief,
+along with a few similar functions that have not been mentioned yet.
 
 @table @code
 @item eval-last-sexp
@@ -4393,10 +4391,10 @@ invoked with an argument; in that case, the output is printed in the
 current buffer.  This command is normally bound to @kbd{C-x C-e}.
 
 @item defun
-Define function.  This special form has up to five parts: the name,
-a template for the arguments that will be passed to the function,
-documentation, an optional interactive declaration, and the body of the
-definition.
+Define function.  This macro has up to five parts: the name, a
+template for the arguments that will be passed to the function,
+documentation, an optional interactive declaration, and the body of
+the definition.
 
 @need 1250
 For example, in an early version of Emacs, the function definition was
@@ -4803,7 +4801,7 @@ leave mark at previous position."
 @end smallexample
 
 Like all function definitions, this definition has five parts following
-the special form @code{defun}:
+the macro @code{defun}:
 
 @enumerate
 @item
@@ -9293,10 +9291,6 @@ have a value.  If the variable already has a value, @code{defvar} does
 not override the existing value.  Second, @code{defvar} has a
 documentation string.
 
-(Another special form, @code{defcustom}, is designed for variables
-that people customize.  It has more features than @code{defvar}.
-(@xref{defcustom, , Setting Variables with @code{defcustom}}.)
-
 @menu
 * See variable current value::
 * defvar and asterisk::
@@ -11300,11 +11294,11 @@ Let's expand on the metaphor in which a computer program is a robot.
 
 A function definition provides the blueprints for a robot.  When you
 install a function definition, that is, when you evaluate a
-@code{defun} special form, you install the necessary equipment to
-build robots.  It is as if you were in a factory, setting up an
-assembly line.  Robots with the same name are built according to the
-same blueprints.  So they have, as it were, the same `model number',
-but a different `serial number'.
+@code{defun} macro, you install the necessary equipment to build
+robots.  It is as if you were in a factory, setting up an assembly
+line.  Robots with the same name are built according to the same
+blueprints.  So they have, as it were, the same `model number', but a
+different `serial number'.
 
 We often say that a recursive function `calls itself'.  What we mean
 is that the instructions in a recursive function cause the Lisp
@@ -16971,10 +16965,9 @@ definitions; but you can write @code{defuns} in your @file{.emacs}
 file.  Indeed, you can write any Lisp expression in your @file{.emacs}
 file.)
 
-The @code{customize} feature depends on the @code{defcustom} special
-form.  Although you can use @code{defvar} or @code{setq} for variables
-that users set, the @code{defcustom} special form is designed for the
-job.
+The @code{customize} feature depends on the @code{defcustom} macro.
+Although you can use @code{defvar} or @code{setq} for variables that
+users set, the @code{defcustom} macro is designed for the job.
 
 You can use your knowledge of @code{defvar} for writing the
 first three arguments for @code{defcustom}.  The first argument to
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 36c8b8dbea7..f770fb3cada 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
 2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
 
+        * internals.texi (Writing Emacs Primitives): Remove unnecessary
+        references to the sources. (Bug#13800)
+
         * searching.texi (Regexp Backslash): Doc fix for backslash
         constructs in regular expressions.
 
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 3269776b626..24440858b7e 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -661,15 +661,33 @@ equivalent of @code{&rest}).  Both @code{UNEVALLED} and @code{MANY} are
 macros.  If @var{max} is a number, it must be more than @var{min} but
 less than 8.
 
+@cindex interactive specification in primitives
 @item interactive
-This is an interactive specification, a string such as might be used as
-the argument of @code{interactive} in a Lisp function.  In the case of
-@code{or}, it is 0 (a null pointer), indicating that @code{or} cannot be
-called interactively.  A value of @code{""} indicates a function that
-should receive no arguments when called interactively.  If the value
-begins with a @samp{(}, the string is evaluated as a Lisp form.
-For examples of the last two forms, see @code{widen} and
-@code{narrow-to-region} in @file{editfns.c}.
+This is an interactive specification, a string such as might be used
+as the argument of @code{interactive} in a Lisp function.  In the case
+of @code{or}, it is 0 (a null pointer), indicating that @code{or}
+cannot be called interactively.  A value of @code{""} indicates a function that should receive no
+arguments when called interactively.  For example:
+
+@smallexample
+@group
+DEFUN ("baz", Fbaz, Sbaz, 0, 0, "",
+       doc: /* @dots{} */)
+@end group
+@end smallexample
+
+If the value begins with a @samp{"(}, the string is evaluated as a
+Lisp form.  For example:
+
+@smallexample
+@group
+DEFUN ("foo", Ffoo, Sfoo, 0, UNEVALLED, "(list
+              (read-char-by-name \"Insert character (Unicode name or hex): \")\
+              (prefix-numeric-value current-prefix-arg)\
+              t))",
+  doc: /* @dots{} /*)
+@end group
+@end smallexample
 
 @item doc
 This is the documentation string.  It uses C comment syntax rather
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afb1ffd06fe..9c3be36984b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-22  Daiki Ueno  <ueno@gnu.org>
+
+        * epg.el (epg-context-pinentry-mode): New function.
+        (epg-context-set-pinentry-mode): New function.
+        (epg--start): Pass --pinentry-mode option to gpg command.
+
 2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
 
         * comint.el: (comint-dynamic-complete-functions, comint-mode-map):
@@ -53,7 +59,7 @@
 2013-04-19 Masatake YAMATO  <yamato@redhat.com>
 
         * progmodes/sh-script.el (sh-imenu-generic-expression):
-        Handle function names with a single character.   (Bug#11182)
+        Handle function names with a single character.   (Bug#14111)
 
 2013-04-19  Dima Kogan  <dima@secretsauce.net>    (tiny change)
 
diff --git a/lisp/epg.el b/lisp/epg.el
index 3f04aa2e07a..c36de7e4624 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -195,7 +195,7 @@
                 cipher-algorithm digest-algorithm compress-algorithm
                 (list #'epg-passphrase-callback-function)
                 nil
-                nil nil nil nil nil nil)))
+                nil nil nil nil nil nil nil)))
 
 (defun epg-context-protocol (context)
   "Return the protocol used within CONTEXT."
@@ -289,6 +289,12 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aref (cdr context) 14))
 
+(defun epg-context-pinentry-mode (context)
+  "Return the mode of pinentry invocation."
+  (unless (eq (car-safe context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (aref (cdr context) 15))
+
 (defun epg-context-set-protocol (context protocol)
   "Set the protocol used within CONTEXT."
   (unless (eq (car-safe context) 'epg-context)
@@ -407,6 +413,14 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 14 operation))
 
+(defun epg-context-set-pinentry-mode (context mode)
+  "Set the mode of pinentry invocation."
+  (unless (eq (car-safe context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (unless (memq mode '(nil ask cancel error loopback))
+    (signal 'epg-error (list "Unknown pinentry mode" mode)))
+  (aset (cdr context) 15 mode))
+
 (defun epg-make-signature (status &optional key-id)
   "Return a signature object."
   (cons 'epg-signature (vector status key-id nil nil nil nil nil nil nil nil
@@ -1152,6 +1166,10 @@ This function is for internal use only."
                        (if (epg-context-textmode context) '("--textmode"))
                        (if (epg-context-output-file context)
                            (list "--output" (epg-context-output-file context)))
+                       (if (epg-context-pinentry-mode context)
+                           (list "--pinentry-mode"
+                                 (symbol-name (epg-context-pinentry-mode
+                                               context))))
                        args))
          (coding-system-for-write 'binary)
          (coding-system-for-read 'binary)
diff --git a/make-dist b/make-dist
index 283defe8a7d..e1e62c895c7 100755
--- a/make-dist
+++ b/make-dist
@@ -439,6 +439,9 @@ echo "Making links to \`lwlib'"
 
 echo "Making links to \`admin' and its subdirectories"
 for f in `find admin -type f`; do
+  case $f in
+    admin/unidata/Makefile) continue ;;
+  esac
   ln $f $tempdir/$f
 done
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 5164dc8ff8d..31764cad485 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (bootstrap-clean): Remove stamp-h1 too.
+        Without this fix, "make distclean" leaves stamp-h1 behind.
+
 2013-04-20  Erik Charlebois  <erikcharlebois@gmail.com>
 
         * w32fns.c (w32_fullscreen_rect): New function to compute the
diff --git a/src/Makefile.in b/src/Makefile.in
index ac09d41858d..d6516e812dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -545,7 +545,7 @@ clean: mostlyclean
 ## It should remove all files generated during a compilation/bootstrap,
 ## but not things like config.status or TAGS.
 bootstrap-clean: clean
-        rm -f epaths.h config.h config.stamp stamp-oldxmenu ../etc/DOC-*
+        rm -f epaths.h config.h config.stamp stamp-h1 stamp-oldxmenu ../etc/DOC-*
         if test -f ./.gdbinit; then \
           mv ./.gdbinit ./.gdbinit.save; \
           if test -f "$(srcdir)/.gdbinit"; then rm -f ./.gdbinit.save; \