Now on revision 112352. ------------------------------------------------------------ revno: 112352 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-04-21 22:18:30 -0700 message: * Makefile.in (bootstrap-clean): Remove stamp-h1 too. Without this fix, "make distclean" leaves stamp-h1 behind. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-04-20 07:32:31 +0000 +++ src/ChangeLog 2013-04-22 05:18:30 +0000 @@ -1,3 +1,8 @@ +2013-04-22 Paul Eggert + + * Makefile.in (bootstrap-clean): Remove stamp-h1 too. + Without this fix, "make distclean" leaves stamp-h1 behind. + 2013-04-20 Erik Charlebois * w32fns.c (w32_fullscreen_rect): New function to compute the === modified file 'src/Makefile.in' --- src/Makefile.in 2013-04-07 06:21:40 +0000 +++ src/Makefile.in 2013-04-22 05:18:30 +0000 @@ -532,7 +532,7 @@ ## 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; \ ------------------------------------------------------------ revno: 112351 author: Paul Eggert committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-04-21 22:08:36 -0700 message: * make-dist: Do not distribute admin/unidata/Makefile. It is generated by 'configure'. diff: === modified file 'ChangeLog' --- ChangeLog 2013-04-22 05:01:33 +0000 +++ ChangeLog 2013-04-22 05:08:36 +0000 @@ -1,5 +1,8 @@ 2013-04-22 Paul Eggert + * 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. === modified file 'make-dist' --- make-dist 2013-03-03 02:43:30 +0000 +++ make-dist 2013-04-22 05:08:36 +0000 @@ -439,6 +439,9 @@ 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 ------------------------------------------------------------ revno: 112350 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-04-21 22:01:33 -0700 message: * 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. diff: === modified file 'ChangeLog' --- ChangeLog 2013-04-18 17:12:21 +0000 +++ ChangeLog 2013-04-22 05:01:33 +0000 @@ -1,3 +1,9 @@ +2013-04-22 Paul Eggert + + * 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 (tiny change) * configure.ac: Add DragonFly BSD, mostly same as FreeBSD. (Bug#14068) === modified file 'build-aux/update-subdirs' --- build-aux/update-subdirs 2013-01-01 09:11:05 +0000 +++ build-aux/update-subdirs 2013-04-22 05:01:33 +0000 @@ -49,8 +49,8 @@ ;; 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 ------------------------------------------------------------ revno: 112349 committer: Daiki Ueno branch nick: trunk timestamp: Mon 2013-04-22 13:53:05 +0900 message: epg.el: support pinentry mode added in GnuPG 2.1 * epg.el (epg-context-pinentry-mode): New function. (epg-context-set-pinentry-mode): New function. (epg--start): Pass --pinentry-mode option to gpg command. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-22 01:47:58 +0000 +++ lisp/ChangeLog 2013-04-22 04:53:05 +0000 @@ -1,3 +1,9 @@ +2013-04-22 Daiki Ueno + + * 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 * comint.el: (comint-dynamic-complete-functions, comint-mode-map): === modified file 'lisp/epg.el' --- lisp/epg.el 2013-01-04 22:54:08 +0000 +++ lisp/epg.el 2013-04-22 04:53:05 +0000 @@ -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 @@ (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 @@ (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 @@ (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) ------------------------------------------------------------ revno: 112348 committer: Glenn Morris branch nick: trunk timestamp: Sun 2013-04-21 18:47:58 -0700 message: ChangeLog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-21 03:13:04 +0000 +++ lisp/ChangeLog 2013-04-22 01:47:58 +0000 @@ -53,7 +53,7 @@ 2013-04-19 Masatake YAMATO * 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 (tiny change) ------------------------------------------------------------ revno: 112347 [merge] committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-04-21 20:01:04 +0800 message: * doc/lispintro/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) diff: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-04-04 03:46:25 +0000 +++ doc/lispintro/ChangeLog 2013-04-21 11:56:28 +0000 @@ -1,3 +1,10 @@ +2013-04-21 Xue Fuqiao + + * 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 * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org. === modified file 'doc/lispintro/emacs-lisp-intro.texi' --- doc/lispintro/emacs-lisp-intro.texi 2013-03-16 22:08:22 +0000 +++ doc/lispintro/emacs-lisp-intro.texi 2013-04-21 11:56:28 +0000 @@ -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 @@ 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 @@ @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 @@ @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 @@ 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 @@ @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 @@ 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 @@ 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 @@ 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 ------------------------------------------------------------ revno: 112346 [merge] committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-04-21 19:22:05 +0800 message: * doc/lispref/internals.texi (Writing Emacs Primitives): Remove unnecessary references to the sources. (Bug#13800) diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-04-21 03:27:51 +0000 +++ doc/lispref/ChangeLog 2013-04-21 11:16:30 +0000 @@ -1,5 +1,8 @@ 2013-04-21 Xue Fuqiao + * 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. === modified file 'doc/lispref/internals.texi' --- doc/lispref/internals.texi 2013-01-02 16:13:04 +0000 +++ doc/lispref/internals.texi 2013-04-21 11:16:30 +0000 @@ -661,15 +661,33 @@ 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 ------------------------------------------------------------ revno: 112345 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-04-21 11:27:51 +0800 message: searching.texi (Regexp Backslash): Doc fix for backslash constructs in regular expressions. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-04-15 17:01:00 +0000 +++ doc/lispref/ChangeLog 2013-04-21 03:27:51 +0000 @@ -1,3 +1,8 @@ +2013-04-21 Xue Fuqiao + + * searching.texi (Regexp Backslash): Doc fix for backslash + constructs in regular expressions. + 2013-04-15 Christopher Schmidt * tips.texi (Coding Conventions): Mention separation of package === modified file 'doc/lispref/searching.texi' --- doc/lispref/searching.texi 2013-01-03 02:15:57 +0000 +++ doc/lispref/searching.texi 2013-04-21 03:27:51 +0000 @@ -589,10 +589,8 @@ For the most part, @samp{\} followed by any character matches only that character. However, there are several exceptions: certain -two-character sequences starting with @samp{\} that have special -meanings. (The character after the @samp{\} in such a sequence is -always ordinary when used on its own.) Here is a table of the special -@samp{\} constructs. +sequences starting with @samp{\} that have special meanings. Here is +a table of the special @samp{\} constructs. @table @samp @item \| ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.