Now on revision 111418. ------------------------------------------------------------ revno: 111418 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13237 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-01-03 22:42:11 -0500 message: * lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases of called-interactively-p as well. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-04 02:53:48 +0000 +++ lisp/ChangeLog 2013-01-04 03:42:11 +0000 @@ -1,5 +1,8 @@ 2013-01-04 Stefan Monnier + * subr.el (internal--called-interactively-p--get-frame): Find aliases + of called-interactively-p as well (bug#13237). + * view.el (view--enable, view--disable): Rename from view-mode-enable and view-mode-disable and assume it's called from view-mode. (view-mode-enable, view-mode-disable): Redefine as obsolete === modified file 'lisp/subr.el' --- lisp/subr.el 2013-01-03 02:37:57 +0000 +++ lisp/subr.el 2013-01-04 03:42:11 +0000 @@ -3977,8 +3977,8 @@ `(progn (defvar ,sym (let ((i 1)) - (while (not (eq (nth 1 (backtrace-frame i)) - 'called-interactively-p)) + (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t) + (indirect-function 'called-interactively-p))) (setq i (1+ i))) i)) ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p) ------------------------------------------------------------ revno: 111417 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-01-03 21:53:48 -0500 message: * lisp/view.el (view--enable, view--disable): Rename from view-mode-enable and view-mode-disable and assume it's called from view-mode. (view-mode-enable, view-mode-disable): Redefine as obsolete compatibility layer above view-mode. (view-mode-enter): Call `view-mode'. * lisp/files.el (after-find-file): Call `view-mode'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-04 02:45:59 +0000 +++ lisp/ChangeLog 2013-01-04 02:53:48 +0000 @@ -1,5 +1,13 @@ 2013-01-04 Stefan Monnier + * view.el (view--enable, view--disable): Rename from view-mode-enable + and view-mode-disable and assume it's called from view-mode. + (view-mode-enable, view-mode-disable): Redefine as obsolete + compatibility layer above view-mode. + (view-mode-enter): Call `view-mode'. + + * files.el (after-find-file): Call `view-mode'. + * doc-view.el (doc-view-scale-internally): New var. (doc-view-enlarge, doc-view-insert-image): Obey it. @@ -348,6 +356,8 @@ (lm-homepage): New function. (lm-with-file): Don't be confused if narrowing is in effect. +2012-12-19 Stefan Monnier + * vc/diff-mode.el (diff-post-command-hook): Don't ignore changes at the very beginning of a hunk (e.g. killing the first line). === modified file 'lisp/files.el' --- lisp/files.el 2013-01-02 16:13:04 +0000 +++ lisp/files.el 2013-01-04 02:53:48 +0000 @@ -209,7 +209,6 @@ (declare-function dired-unmark "dired" (arg)) (declare-function dired-do-flagged-delete "dired" (&optional nomessage)) (declare-function dos-8+3-filename "dos-fns" (filename)) -(declare-function view-mode-disable "view" ()) (declare-function dosified-file-name "dos-fns" (file-name)) (defvar file-name-invalid-regexp @@ -2125,7 +2124,7 @@ (setq buffer-read-only t)) (unless nomodes (when (and view-read-only view-mode) - (view-mode-disable)) + (view-mode -1)) (normal-mode t) ;; If requested, add a newline at the end of the file. (and (memq require-final-newline '(visit visit-save)) === modified file 'lisp/view.el' --- lisp/view.el 2013-01-02 16:13:04 +0000 +++ lisp/view.el 2013-01-04 02:53:48 +0000 @@ -461,16 +461,13 @@ Entry to view-mode runs the normal hook `view-mode-hook'." :lighter " View" :keymap view-mode-map - (if view-mode (view-mode-enable) (view-mode-disable))) + (if view-mode (view--enable) (view--disable))) -(defun view-mode-enable (&optional run-view-mode-hook) - "Turn on View mode. -Run `view-mode-hook' when RUN-VIEW-MODE-HOOK is non-nil." +(defun view--enable () ;; Always leave view mode before changing major mode. ;; This is to guarantee that the buffer-read-only variable is restored. - (add-hook 'change-major-mode-hook 'view-mode-disable nil t) - (setq view-mode t - view-page-size nil + (add-hook 'change-major-mode-hook 'view--disable nil t) + (setq view-page-size nil view-half-page-size nil view-old-buffer-read-only buffer-read-only buffer-read-only t) @@ -481,16 +478,18 @@ (format "continue viewing %s" (if (buffer-file-name) (file-name-nondirectory (buffer-file-name)) - (buffer-name))))) - (force-mode-line-update) - (when run-view-mode-hook - (run-hooks 'view-mode-hook))) - + (buffer-name)))))) + + +(define-obsolete-function-alias 'view-mode-enable 'view-mode "24.4") (defun view-mode-disable () "Turn off View mode." - (remove-hook 'change-major-mode-hook 'view-mode-disable t) + (declare (obsolete view-mode "24.4")) + (view-mode -1)) + +(defun view--disable () + (remove-hook 'change-major-mode-hook 'view--disable t) (and view-overlay (delete-overlay view-overlay)) - (force-mode-line-update) ;; Calling toggle-read-only while View mode is enabled ;; sets view-read-only to t as a buffer-local variable ;; after exiting View mode. That arranges that the next toggle-read-only @@ -499,7 +498,6 @@ ;; so that View mode stays off if toggle-read-only is called. (if (local-variable-p 'view-read-only) (kill-local-variable 'view-read-only)) - (setq view-mode nil) (if (boundp 'Helper-return-blurb) (setq Helper-return-blurb view-old-Helper-return-blurb)) (if buffer-read-only @@ -562,8 +560,7 @@ (setq view-exit-action exit-action)) (unless view-mode - (view-mode-enable t) - (force-mode-line-update) + (view-mode 1) (unless view-inhibit-help-message (message "%s" (substitute-command-keys "\ @@ -590,7 +587,7 @@ (when view-mode (let ((buffer (window-buffer))) (unless view-no-disable-on-exit - (view-mode-disable)) + (view-mode -1)) (unless exit-only (cond @@ -601,8 +598,7 @@ (quit-window))) (when exit-action - (funcall exit-action buffer)) - (force-mode-line-update))))) + (funcall exit-action buffer)))))) (defun View-exit () "Exit View mode but stay in current buffer." === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-04 02:42:08 +0000 +++ src/ChangeLog 2013-01-04 02:53:48 +0000 @@ -261,7 +261,7 @@ * xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove. (redisplay_internal): Don't bother selecting the frame to get the - proper value of frame-local variables. + proper value of frame-local variables (bug#13225). 2012-12-20 Dmitry Antipov === modified file 'src/fns.c' --- src/fns.c 2013-01-03 02:37:57 +0000 +++ src/fns.c 2013-01-04 02:53:48 +0000 @@ -86,7 +86,7 @@ before it's time to do a QUIT. This must be a power of 2. */ enum { QUIT_COUNT_HEURISTIC = 1 << 16 }; -/* Random data-structure functions */ +/* Random data-structure functions. */ DEFUN ("length", Flength, Slength, 1, 1, 0, doc: /* Return the length of vector, list or string SEQUENCE. === modified file 'test/indent/shell.sh' --- test/indent/shell.sh 2012-10-31 03:10:25 +0000 +++ test/indent/shell.sh 2013-01-04 02:53:48 +0000 @@ -5,6 +5,18 @@ # adsgsdg +case $X in + foo) + do_something + ;; + arg=*) # bug#12953 + do_something_else_based_on_arg + ;; + *) + default + ;; +esac + echo -n $(( 5 << 2 )) # This should not be treated as a heredoc (bug#12770). 2 ------------------------------------------------------------ revno: 111416 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-01-03 21:45:59 -0500 message: * lisp/doc-view.el (doc-view-scale-internally): New var. (doc-view-enlarge, doc-view-insert-image): Obey it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-03 23:56:51 +0000 +++ lisp/ChangeLog 2013-01-04 02:45:59 +0000 @@ -1,3 +1,8 @@ +2013-01-04 Stefan Monnier + + * doc-view.el (doc-view-scale-internally): New var. + (doc-view-enlarge, doc-view-insert-image): Obey it. + 2013-01-03 Daiki Ueno * epg.el (epg--start): Ignore errors when /dev/fd/0 does not === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2013-01-01 09:11:05 +0000 +++ lisp/doc-view.el 2013-01-04 02:45:59 +0000 @@ -173,9 +173,17 @@ :type 'number :group 'doc-view) +(defcustom doc-view-scale-internally t + "Whether we should try to rescale images ourselves. +If nil, the document is re-rendered every time the scaling factor is modified. +This only has an effect if the image libraries linked with Emacs support +scaling." + :type 'boolean) + (defcustom doc-view-image-width 850 "Default image width. -Has only an effect if imagemagick support is compiled into emacs." +Has only an effect if `doc-view-scale-internally' is non-nil and support for +scaling is compiled into emacs." :version "24.1" :type 'number :group 'doc-view) @@ -669,8 +677,9 @@ (defun doc-view-enlarge (factor) "Enlarge the document by FACTOR." (interactive (list doc-view-shrink-factor)) - (if (eq (plist-get (cdr (doc-view-current-image)) :type) - 'imagemagick) + (if (and doc-view-scale-internally + (eq (plist-get (cdr (doc-view-current-image)) :type) + 'imagemagick)) ;; ImageMagick supports on-the-fly-rescaling. (let ((new (ceiling (* factor doc-view-image-width)))) (unless (equal new doc-view-image-width) @@ -1133,10 +1142,11 @@ (setq doc-view-pending-cache-flush nil)) (let ((ol (doc-view-current-overlay)) (image (if (and file (file-readable-p file)) - (if (not (fboundp 'imagemagick-types)) + (if (not (and doc-view-scale-internally + (fboundp 'imagemagick-types))) (apply 'create-image file 'png nil args) (unless (member :width args) - (setq args (append args (list :width doc-view-image-width)))) + (setq args `(,@args :width ,doc-view-image-width))) (apply 'create-image file 'imagemagick nil args)))) (slice (doc-view-current-slice))) (setf (doc-view-current-image) image) ------------------------------------------------------------ revno: 111415 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2013-01-03 21:42:08 -0500 message: * src/fileio.c (Ffile_acl): Undocument return format. * doc/lispref/files.texi (File Attributes): Idem. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-01-03 02:37:57 +0000 +++ doc/lispref/ChangeLog 2013-01-04 02:42:08 +0000 @@ -1,3 +1,7 @@ +2013-01-04 Stefan Monnier + + * files.texi (File Attributes): Undocument return format of file-acl. + 2013-01-03 Glenn Morris * processes.texi (System Processes): === modified file 'doc/lispref/files.texi' --- doc/lispref/files.texi 2013-01-02 16:13:04 +0000 +++ doc/lispref/files.texi 2013-01-04 02:42:08 +0000 @@ -1363,7 +1363,7 @@ @defun file-acl filename This function returns the ACL entries of the file @var{filename}. The -return value is a platform-dependent string containing the textual +return value is a platform-dependent object containing some representation of the ACL entries. Don't use it for anything except passing it to the @code{set-file-acl} function (@pxref{Changing Files, set-file-acl}). === modified file 'src/ChangeLog' --- src/ChangeLog 2013-01-02 19:02:05 +0000 +++ src/ChangeLog 2013-01-04 02:42:08 +0000 @@ -1,3 +1,7 @@ +2013-01-04 Stefan Monnier + + * fileio.c (Ffile_acl): Undocument return format. + 2013-01-02 Glenn Morris * keymap.c (Fkey_description): Doc fix. (Bug#13323) === modified file 'src/fileio.c' --- src/fileio.c 2013-01-02 16:13:04 +0000 +++ src/fileio.c 2013-01-04 02:42:08 +0000 @@ -3084,11 +3084,11 @@ } DEFUN ("file-acl", Ffile_acl, Sfile_acl, 1, 1, 0, - doc: /* Return ACL entries of file named FILENAME, as a string. + doc: /* Return ACL entries of file named FILENAME. +The entries are returned in a format suitable for use in `set-file-acl' +but is otherwise undocumented and subject to change. Return nil if file does not exist or is not accessible, or if Emacs -was unable to determine the ACL entries. The latter can happen for -local files if Emacs was not compiled with ACL support, or for remote -files if the file handler returns nil for the file's ACL entries. */) +was unable to determine the ACL entries. */) (Lisp_Object filename) { Lisp_Object absname; ------------------------------------------------------------ revno: 111414 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-01-03 18:17:49 -0800 message: Merge from gnulib. This incorporates: 2013-01-04 stdio: remove now-unnecessary stdio.c 2013-01-04 fprintftime: depend on stdio, not ignore-value 2013-01-04 fwrite: silence __wur only for older glibc versions 2013-01-04 fwrite: silence __wur without using inline * lib/stdio.c: Remove. * lib/stdio.in.h, lib/strftime.c: Update from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. diff: === modified file 'ChangeLog' --- ChangeLog 2013-01-02 16:37:04 +0000 +++ ChangeLog 2013-01-04 02:17:49 +0000 @@ -1,3 +1,14 @@ +2013-01-04 Paul Eggert + + Merge from gnulib, incorporating: + 2013-01-04 stdio: remove now-unnecessary stdio.c + 2013-01-04 fprintftime: depend on stdio, not ignore-value + 2013-01-04 fwrite: silence __wur only for older glibc versions + 2013-01-04 fwrite: silence __wur without using inline + * lib/stdio.c: Remove. + * lib/stdio.in.h, lib/strftime.c: Update from gnulib. + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + 2013-01-02 Paul Eggert Merge from gnulib, incorporating copyright-date changes and: === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2013-01-02 16:37:04 +0000 +++ lib/gnulib.mk 2013-01-04 02:17:49 +0000 @@ -774,7 +774,6 @@ ## begin gnulib module stdio BUILT_SOURCES += stdio.h -libgnu_a_SOURCES += stdio.c # We need the following in order to create when the system # doesn't have one that works with the given compiler. === removed file 'lib/stdio.c' --- lib/stdio.c 2012-11-30 18:25:59 +0000 +++ lib/stdio.c 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -#include -#define _GL_STDIO_INLINE _GL_EXTERN_INLINE -#include "stdio.h" === modified file 'lib/stdio.in.h' --- lib/stdio.in.h 2013-01-02 16:37:04 +0000 +++ lib/stdio.in.h 2013-01-04 02:17:49 +0000 @@ -46,11 +46,6 @@ #ifndef _@GUARD_PREFIX@_STDIO_H #define _@GUARD_PREFIX@_STDIO_H -_GL_INLINE_HEADER_BEGIN -#ifndef _GL_STDIO_INLINE -# define _GL_STDIO_INLINE _GL_INLINE -#endif - /* Get va_list. Needed on many systems, including glibc 2.8. */ #include @@ -580,21 +575,17 @@ _GL_CXXALIAS_SYS (fwrite, size_t, (const void *ptr, size_t s, size_t n, FILE *stream)); -/* Work around glibc bug 11959 +/* Work around bug 11959 when fortifying glibc 2.4 through 2.15 , which sometimes causes an unwanted diagnostic for fwrite calls. - This affects only function declaration attributes, so it's not - needed for C++. */ -# if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL -_GL_STDIO_INLINE size_t _GL_ARG_NONNULL ((1, 4)) -rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream) -{ - size_t r = fwrite (ptr, s, n, stream); - (void) r; - return r; -} + This affects only function declaration attributes under certain + versions of gcc, and is not needed for C++. */ +# if (0 < __USE_FORTIFY_LEVEL \ + && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \ + && 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \ + && !defined __cplusplus) # undef fwrite -# define fwrite rpl_fwrite +# define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; }) # endif # endif _GL_CXXALIASWARN (fwrite); @@ -1338,8 +1329,6 @@ "POSIX compliance"); #endif -_GL_INLINE_HEADER_END - #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif /* _@GUARD_PREFIX@_STDIO_H */ #endif === modified file 'lib/strftime.c' --- lib/strftime.c 2013-01-01 09:11:05 +0000 +++ lib/strftime.c 2013-01-04 02:17:49 +0000 @@ -26,7 +26,6 @@ #else # include # if FPRINTFTIME -# include "ignore-value.h" # include "fprintftime.h" # else # include "strftime.h" @@ -209,15 +208,7 @@ else if (to_uppcase) \ fwrite_uppcase (p, (s), _n); \ else \ - { \ - /* We are ignoring the value of fwrite here, in spite of the \ - fact that technically, that may not be valid: the fwrite \ - specification in POSIX 2008 defers to that of fputc, which \ - is intended to be consistent with the one from ISO C, \ - which permits failure due to ENOMEM *without* setting the \ - stream's error indicator. */ \ - ignore_value (fwrite ((s), _n, 1, p)); \ - } \ + fwrite (s, _n, 1, p); \ } \ while (0) \ ) === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2013-01-02 16:37:04 +0000 +++ m4/gnulib-comp.m4 2013-01-04 02:17:49 +0000 @@ -712,7 +712,6 @@ lib/stdbool.in.h lib/stddef.in.h lib/stdint.in.h - lib/stdio.c lib/stdio.in.h lib/stdlib.in.h lib/strftime.c ------------------------------------------------------------ revno: 111413 fixes bug: http://debbugs.gnu.org/13235 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-01-03 17:31:52 -0800 message: * lisp/erc/erc-backend.el (312): Fix typo. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2013-01-02 16:13:04 +0000 +++ lisp/erc/ChangeLog 2013-01-04 01:31:52 +0000 @@ -1,3 +1,7 @@ +2013-01-04 Glenn Morris + + * erc-backend.el (312): Fix typo. (Bug#13235) + 2012-11-30 Glenn Morris * erc.el (erc-accidental-paste-threshold-seconds): Add :version. === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2013-01-02 16:13:04 +0000 +++ lisp/erc/erc-backend.el 2013-01-04 01:31:52 +0000 @@ -1633,8 +1633,8 @@ (define-erc-response-handler (312) "Server name response in WHOIS." nil - (pcase-let ((`(,nick ,server-host)) - (cdr (erc-response.command-args parsed))) + (pcase-let ((`(,nick ,server-host) + (cdr (erc-response.command-args parsed)))) (erc-display-message parsed 'notice 'active 's312 ?n nick ?s server-host ?c (erc-response.contents parsed)))) ------------------------------------------------------------ revno: 111412 committer: Daiki Ueno branch nick: trunk timestamp: Fri 2013-01-04 08:56:51 +0900 message: * epg.el (epg--start): Ignore errors when /dev/fd/0 does not exist. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-03 19:41:59 +0000 +++ lisp/ChangeLog 2013-01-03 23:56:51 +0000 @@ -1,3 +1,8 @@ +2013-01-03 Daiki Ueno + + * epg.el (epg--start): Ignore errors when /dev/fd/0 does not + exist. (Bug#13344) + 2013-01-03 Glenn Morris * mail/rmail.el (rmail-set-header-1): Ignore case. === modified file 'lisp/epg.el' --- lisp/epg.el 2013-01-02 16:13:04 +0000 +++ lisp/epg.el 2013-01-03 23:56:51 +0000 @@ -1167,9 +1167,11 @@ ;; use `terminal-name' here to get the real pty name for the child ;; process, though /dev/fd/0" is not portable. (with-temp-buffer - (when (= (call-process "tty" "/dev/fd/0" t) 0) - (delete-backward-char 1) - (setq terminal-name (buffer-string)))) + (condition-case nil + (when (= (call-process "tty" "/dev/fd/0" t) 0) + (delete-backward-char 1) + (setq terminal-name (buffer-string))) + (file-error))) (when terminal-name (setq process-environment (cons (concat "GPG_TTY=" terminal-name) ------------------------------------------------------------ revno: 111411 fixes bug: http://debbugs.gnu.org/13330 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-01-03 11:41:59 -0800 message: * lisp/mail/rmail.el (rmail-set-header-1): Handle multi-line headers Ignore case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-03 08:23:10 +0000 +++ lisp/ChangeLog 2013-01-03 19:41:59 +0000 @@ -1,5 +1,8 @@ 2013-01-03 Glenn Morris + * mail/rmail.el (rmail-set-header-1): Ignore case. + Handle multi-line headers. (Bug#13330) + * progmodes/make-mode.el (makefile-fill-paragraph): Add doc. Handle paragraph starting at beginning of buffer. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2013-01-02 16:13:04 +0000 +++ lisp/mail/rmail.el 2013-01-03 19:41:59 +0000 @@ -2173,20 +2173,35 @@ (defun rmail-set-header-1 (name value) "Subroutine of `rmail-set-header'. -Narrow to header, set header NAME to VALUE, replacing existing if present. -VALUE nil means to remove NAME altogether." +Narrow to headers, set header NAME to VALUE, replacing existing if present. +VALUE nil means to remove NAME altogether. + +Only changes the first instance of NAME. If VALUE is multi-line, +continuation lines should already be indented. VALUE should not +end in a newline." (if (search-forward "\n\n" nil t) (progn (forward-char -1) (narrow-to-region (point-min) (point)) + ;; cf mail-fetch-field. (goto-char (point-min)) - (if (re-search-forward (concat "^" (regexp-quote name) ":") nil 'move) + (if (let ((case-fold-search t)) + (re-search-forward (concat "^" (regexp-quote name) "[ \t]*:") + nil 'move)) + (let ((start (point)) + end) + (while (and (zerop (forward-line 1)) + (looking-at "[ \t]"))) + ;; Back up over newline. + (forward-char -1) + (setq end (point)) + (goto-char start) (if value (progn - (delete-region (point) (line-end-position)) + (delete-region start end) (insert " " value)) - (delete-region (line-beginning-position) - (line-beginning-position 2))) + (delete-region (line-beginning-position) (1+ end)))) + ;; Not already present: insert at end of headers. (if value (insert name ": " value "\n")))) (rmail-error-bad-format))) ------------------------------------------------------------ revno: 111410 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-01-03 06:18:24 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2012-12-31 11:17:37 +0000 +++ autogen/Makefile.in 2013-01-03 11:18:24 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by === modified file 'autogen/config.in' --- autogen/config.in 2012-12-31 11:17:37 +0000 +++ autogen/config.in 2013-01-03 11:18:24 +0000 @@ -2,7 +2,7 @@ /* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'autogen/configure' --- autogen/configure 2013-01-02 16:13:04 +0000 +++ autogen/configure 2013-01-03 11:18:24 +0000 @@ -20670,6 +20670,9 @@ /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; + /* Flush out a cygwin core dump. */ + if (dup2 (2, -1) != -1 || errno != EBADF) + result |= 32; return result; ; ------------------------------------------------------------ revno: 111409 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-01-03 00:23:10 -0800 message: makefile-fill-paragraph tweak * lisp/progmodes/make-mode.el (makefile-fill-paragraph): Add doc. Handle paragraph starting at beginning of buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-03 02:37:57 +0000 +++ lisp/ChangeLog 2013-01-03 08:23:10 +0000 @@ -1,5 +1,8 @@ 2013-01-03 Glenn Morris + * progmodes/make-mode.el (makefile-fill-paragraph): Add doc. + Handle paragraph starting at beginning of buffer. + * subr.el (eval-after-load): Don't purecopy the form, so that it can be nconc'd later on; reverts 2009-11-11 change. (Bug#13331) === modified file 'lisp/progmodes/make-mode.el' --- lisp/progmodes/make-mode.el 2013-01-02 16:13:04 +0000 +++ lisp/progmodes/make-mode.el 2013-01-03 08:23:10 +0000 @@ -1273,9 +1273,9 @@ ;; Filling -(defun makefile-fill-paragraph (_arg) - ;; Fill comments, backslashed lines, and variable definitions - ;; specially. +(defun makefile-fill-paragraph (_justify) + "Function used for `fill-paragraph-function' in Makefile mode. +Fill comments, backslashed lines, and variable definitions specially." (save-excursion (beginning-of-line) (cond @@ -1295,7 +1295,9 @@ (end-of-line 0) (while (= (preceding-char) ?\\) (end-of-line 0)) - (forward-char) + ;; Maybe we hit bobp, in which case we are not at EOL. + (if (eq (point) (line-end-position)) + (forward-char)) (point))) (end (save-excursion ------------------------------------------------------------ revno: 111408 [merge] committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-01-02 18:37:57 -0800 message: Merge from emacs-24; up to r111123 diff: === modified file 'configure.ac' --- configure.ac 2013-01-02 16:13:04 +0000 +++ configure.ac 2013-01-03 02:37:57 +0000 @@ -4406,7 +4406,7 @@ AH_TOP([/* GNU Emacs site configuration template file. -Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2012 +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-01-02 19:02:05 +0000 +++ doc/lispref/ChangeLog 2013-01-03 02:37:57 +0000 @@ -1,3 +1,12 @@ +2013-01-03 Glenn Morris + + * processes.texi (System Processes): + * syntax.texi (Syntax Table Functions): Tweak some line breaks. + + * searching.texi (Replacing Match): Fix xref. + + * elisp.texi (DATE): Bump to Jan 2013. + 2013-01-02 Glenn Morris * customize.texi (Common Keywords, Type Keywords): === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2013-01-02 16:13:04 +0000 +++ doc/lispref/elisp.texi 2013-01-03 02:37:57 +0000 @@ -56,7 +56,7 @@ @c (See comments for EDITION in emacs.texi) @set VERSION 3.1 @include emacsver.texi -@set DATE May 2012 +@set DATE January 2013 @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. The manual should go === modified file 'doc/lispref/processes.texi' --- doc/lispref/processes.texi 2013-01-01 09:11:05 +0000 +++ doc/lispref/processes.texi 2013-01-03 02:23:39 +0000 @@ -1804,12 +1804,12 @@ @item start The time when the process was started, in the same -@w{@code{(@var{high} @var{low} @var{microsec} @var{picosec})}} format used by -@code{current-time} and by @code{file-attributes}. +@code{(@var{high} @var{low} @var{microsec} @var{picosec})} format used by +@code{file-attributes} and @code{current-time}. @item etime -The time elapsed since the process started, in the @w{@code{(@var{high} -@var{low} @var{microsec} @var{picosec})}} format. +The time elapsed since the process started, in the format @code{(@var{high} +@var{low} @var{microsec} @var{picosec})}. @item vsize The virtual memory size of the process, measured in kilobytes. === modified file 'doc/lispref/searching.texi' --- doc/lispref/searching.texi 2013-01-01 09:11:05 +0000 +++ doc/lispref/searching.texi 2013-01-03 02:15:57 +0000 @@ -1325,7 +1325,7 @@ @item @samp{\?} This stands for itself (for compatibility with @code{replace-regexp} -and related commands; @pxref{Regexp Replacement,,, emacs, The GNU +and related commands; @pxref{Regexp Replace,,, emacs, The GNU Emacs Manual}). @end table === modified file 'doc/lispref/syntax.texi' --- doc/lispref/syntax.texi 2013-01-01 09:11:05 +0000 +++ doc/lispref/syntax.texi 2013-01-03 02:23:39 +0000 @@ -478,17 +478,17 @@ @end group @group -;; Forward slash characters have punctuation syntax. Note that this -;; @code{char-syntax} call does not reveal that it is also part of -;; comment-start and -end sequences. +;; Forward slash characters have punctuation syntax. +;; Note that this @code{char-syntax} call does not reveal +;; that it is also part of comment-start and -end sequences. (string (char-syntax ?/)) @result{} "." @end group @group -;; Open parenthesis characters have open parenthesis syntax. Note -;; that this @code{char-syntax} call does not reveal that it has a -;; matching character, @samp{)}. +;; Open parenthesis characters have open parenthesis syntax. +;; Note that this @code{char-syntax} call does not reveal that +;; it has a matching character, @samp{)}. (string (char-syntax ?\()) @result{} "(" @end group === modified file 'doc/man/ebrowse.1' --- doc/man/ebrowse.1 2012-01-19 07:21:25 +0000 +++ doc/man/ebrowse.1 2013-01-03 01:35:49 +0000 @@ -85,7 +85,7 @@ Copyright .if t \(co .if n (C) -2008-2012 Free Software Foundation, Inc. +2008-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2012-12-21 19:32:43 +0000 +++ doc/man/emacs.1 2013-01-03 02:37:57 +0000 @@ -642,7 +642,7 @@ Copyright .if t \(co .if n (C) -1995, 1999-2012 Free Software Foundation, Inc. +1995, 1999-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are === modified file 'doc/man/etags.1' --- doc/man/etags.1 2012-12-02 01:47:56 +0000 +++ doc/man/etags.1 2013-01-03 02:37:57 +0000 @@ -268,7 +268,7 @@ Copyright .if t \(co .if n (C) -1992, 1999, 2001-2012 Free Software Foundation, Inc. +1992, 1999, 2001-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are === modified file 'doc/man/grep-changelog.1' --- doc/man/grep-changelog.1 2012-01-19 07:21:25 +0000 +++ doc/man/grep-changelog.1 2013-01-03 01:35:49 +0000 @@ -62,7 +62,7 @@ Copyright .if t \(co .if n (C) -2008-2012 Free Software Foundation, Inc. +2008-2013 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are === modified file 'doc/misc/wisent.texi' --- doc/misc/wisent.texi 2012-12-27 08:21:08 +0000 +++ doc/misc/wisent.texi 2013-01-03 02:37:57 +0000 @@ -23,7 +23,7 @@ @c %**end of header @copying -Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012 +Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2013 Free Software Foundation, Inc. @c Since we are both GNU manuals, we do not need to ack each other here. === modified file 'etc/refcards/calccard.pdf' Binary files etc/refcards/calccard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/calccard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/cs-dired-ref.pdf' Binary files etc/refcards/cs-dired-ref.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/cs-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/cs-refcard.pdf' Binary files etc/refcards/cs-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/cs-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/de-refcard.pdf' Binary files etc/refcards/de-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/de-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/dired-ref.pdf' Binary files etc/refcards/dired-ref.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/dired-ref.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/emacsver.tex' --- etc/refcards/emacsver.tex 2012-09-17 07:22:17 +0000 +++ etc/refcards/emacsver.tex 2013-01-03 01:35:49 +0000 @@ -1,4 +1,4 @@ %% This file is not generated by configure, because then the provided %% pdf files would always appear out-of-date. \def\versionemacs{24} % major version of emacs -\def\year{2012} % latest copyright year +\def\year{2013} % latest copyright year === modified file 'etc/refcards/fr-dired-ref.pdf' Binary files etc/refcards/fr-dired-ref.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/fr-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/fr-refcard.pdf' Binary files etc/refcards/fr-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/fr-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/gnus-booklet.pdf' Binary files etc/refcards/gnus-booklet.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/gnus-booklet.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/gnus-refcard.pdf' Binary files etc/refcards/gnus-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/gnus-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/orgcard.pdf' Binary files etc/refcards/orgcard.pdf 2012-10-26 14:42:05 +0000 and etc/refcards/orgcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/pl-refcard.pdf' Binary files etc/refcards/pl-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/pl-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/pt-br-refcard.pdf' Binary files etc/refcards/pt-br-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/pt-br-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/refcard.pdf' Binary files etc/refcards/refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/ru-refcard.pdf' Binary files etc/refcards/ru-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/ru-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/ru-refcard.tex' --- etc/refcards/ru-refcard.tex 2013-01-01 09:11:05 +0000 +++ etc/refcards/ru-refcard.tex 2013-01-03 01:35:49 +0000 @@ -22,7 +22,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{24} % version of Emacs this is for -\newcommand{\cyear}[0]{2012} % copyright year +\newcommand{\cyear}[0]{2013} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. === modified file 'etc/refcards/sk-dired-ref.pdf' Binary files etc/refcards/sk-dired-ref.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/sk-dired-ref.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'etc/refcards/sk-refcard.pdf' Binary files etc/refcards/sk-refcard.pdf 2012-04-30 07:46:03 +0000 and etc/refcards/sk-refcard.pdf 2013-01-03 02:11:33 +0000 differ === modified file 'lib-src/rcs2log' --- lib-src/rcs2log 2013-01-01 09:11:05 +0000 +++ lib-src/rcs2log 2013-01-03 01:35:49 +0000 @@ -20,7 +20,7 @@ # along with this program. If not, see . -Copyright='Copyright (C) 2012 Free Software Foundation, Inc. +Copyright='Copyright (C) 2013 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-01-03 00:38:32 +0000 +++ lisp/ChangeLog 2013-01-03 02:37:57 +0000 @@ -1,3 +1,11 @@ +2013-01-03 Glenn Morris + + * subr.el (eval-after-load): Don't purecopy the form, so that it + can be nconc'd later on; reverts 2009-11-11 change. (Bug#13331) + + * emacs-lisp/byte-run.el (defun): Place cl declarations + after any interactive spec. (Bug#13265) + 2013-01-02 Andreas Schwab * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as === modified file 'lisp/calc/README' --- lisp/calc/README 2013-01-02 16:13:04 +0000 +++ lisp/calc/README 2013-01-03 02:37:57 +0000 @@ -5,7 +5,7 @@ This directory contains Calc, an advanced desk calculator for GNU Emacs. -"Calc" Copyright (C) 1990-1993, 2001-2012 Free Software Foundation, Inc. +"Calc" Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc. Written by: Dave Gillespie === modified file 'lisp/cedet/semantic/imenu.el' --- lisp/cedet/semantic/imenu.el 2012-01-19 07:21:25 +0000 +++ lisp/cedet/semantic/imenu.el 2013-01-03 01:35:49 +0000 @@ -1,6 +1,6 @@ ;;; semantic/imenu.el --- Use Semantic as an imenu tag generator -;;; Copyright (C) 2000-2005, 2007-2008, 2010-2012 +;;; Copyright (C) 2000-2005, 2007-2008, 2010-2013 ;; Free Software Foundation, Inc. ;; Author: Eric M. Ludlam === modified file 'lisp/emacs-lisp/byte-run.el' --- lisp/emacs-lisp/byte-run.el 2013-01-02 16:13:04 +0000 +++ lisp/emacs-lisp/byte-run.el 2013-01-03 02:37:57 +0000 @@ -199,7 +199,13 @@ (memq (car x) ;C.f. cl-do-proclaim. '(special inline notinline optimize warn))) (push (list 'declare x) - (if (stringp docstring) (cdr body) body)) + (if (stringp docstring) + (if (eq (car-safe (cadr body)) 'interactive) + (cddr body) + (cdr body)) + (if (eq (car-safe (car body)) 'interactive) + (cdr body) + body))) nil) (t (message "Warning: Unknown defun property `%S' in %S" (car x) name))))) === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-01-02 16:13:04 +0000 +++ lisp/net/tramp-sh.el 2013-01-03 02:37:57 +0000 @@ -805,7 +805,7 @@ (defconst tramp-perl-encode "%s -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. use strict; my %%trans = do { @@ -843,7 +843,7 @@ (defconst tramp-perl-decode "%s -e ' # This script contributed by Juanma Barranquero . -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. use strict; my %%trans = do { === modified file 'lisp/org/org-html.el' --- lisp/org/org-html.el 2013-01-01 09:11:05 +0000 +++ lisp/org/org-html.el 2013-01-03 01:46:47 +0000 @@ -104,7 +104,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -351,7 +351,7 @@ @licstart The following is the entire license notice for the JavaScript code below. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code below is free software: you can redistribute it and/or modify it under the terms of the GNU === modified file 'lisp/org/org-jsinfo.el' --- lisp/org/org-jsinfo.el 2013-01-01 09:11:05 +0000 +++ lisp/org/org-jsinfo.el 2013-01-03 01:46:47 +0000 @@ -141,7 +141,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2012-2013 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU === modified file 'lisp/subr.el' --- lisp/subr.el 2013-01-02 16:13:04 +0000 +++ lisp/subr.el 2013-01-03 02:37:57 +0000 @@ -1867,7 +1867,7 @@ ,form))) ;; Add FORM to the element unless it's already there. (unless (member form (cdr elt)) - (nconc elt (purecopy (list form))))))) + (nconc elt (list form)))))) (defvar after-load-functions nil "Special hook run after loading a file. === modified file 'msdos/README' --- msdos/README 2013-01-01 09:11:05 +0000 +++ msdos/README 2013-01-03 01:49:08 +0000 @@ -10,7 +10,7 @@ Windows 3.X. Since these are binary files, their copyright notice is reproduced here: -# Copyright (C) 1993, 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 1993, 2002-2013 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # === modified file 'msdos/depfiles.bat' --- msdos/depfiles.bat 2012-01-05 09:46:05 +0000 +++ msdos/depfiles.bat 2013-01-03 01:35:49 +0000 @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Auxiliary script for MSDOS, run by ../config.bat -rem Copyright (C) 2011-2012 Free Software Foundation, Inc. +rem Copyright (C) 2011-2013 Free Software Foundation, Inc. rem This file is part of GNU Emacs. === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2013-01-02 16:13:04 +0000 +++ msdos/sed2v2.inp 2013-01-03 02:37:57 +0000 @@ -31,7 +31,7 @@ #ifndef MSDOS\ #define MSDOS\ #endif -/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc."/ +/^#undef COPYRIGHT *$/s/^.*$/#define COPYRIGHT "Copyright (C) 2013 Free Software Foundation, Inc."/ /^#undef DIRECTORY_SEP *$/s!^.*$!#define DIRECTORY_SEP '/'! /^#undef DOS_NT *$/s/^.*$/#define DOS_NT/ /^#undef FLOAT_CHECK_DOMAIN *$/s/^.*$/#define FLOAT_CHECK_DOMAIN/ === modified file 'nt/config.nt' --- nt/config.nt 2013-01-02 16:13:04 +0000 +++ nt/config.nt 2013-01-03 02:37:57 +0000 @@ -78,7 +78,7 @@ #undef CLASH_DETECTION /* Short copyright string for this version of Emacs. */ -#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc." +#define COPYRIGHT "Copyright (C) 2013 Free Software Foundation, Inc." /* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP systems. This function is required for 'alloca.c' support on those systems. === modified file 'nt/configure.bat' --- nt/configure.bat 2012-10-17 19:02:44 +0000 +++ nt/configure.bat 2013-01-03 01:35:49 +0000 @@ -1,7 +1,7 @@ @echo off rem ---------------------------------------------------------------------- rem Configuration script for MS Windows operating systems -rem Copyright (C) 1999-2012 Free Software Foundation, Inc. +rem Copyright (C) 1999-2013 Free Software Foundation, Inc. rem This file is part of GNU Emacs. === modified file 'nt/emacs.rc' --- nt/emacs.rc 2012-12-21 19:32:43 +0000 +++ nt/emacs.rc 2013-01-03 02:37:57 +0000 @@ -31,7 +31,7 @@ VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" VALUE "FileVersion", "24, 3, 50, 0\0" VALUE "InternalName", "Emacs\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" VALUE "ProductVersion", "24, 3, 50, 0\0" === modified file 'nt/emacsclient.rc' --- nt/emacsclient.rc 2012-12-21 19:32:43 +0000 +++ nt/emacsclient.rc 2013-01-03 02:37:57 +0000 @@ -25,7 +25,7 @@ VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" VALUE "FileVersion", "24, 3, 50, 0\0" VALUE "InternalName", "EmacsClient\0" - VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" + VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" VALUE "ProductVersion", "24, 3, 50, 0\0" === modified file 'nt/icons/README' --- nt/icons/README 2013-01-01 09:11:05 +0000 +++ nt/icons/README 2013-01-03 01:46:47 +0000 @@ -8,7 +8,7 @@ File: emacs22.ico Author: Andrew Zhilin -Copyright (C) 2005-2012 Free Software Foundation, Inc. +Copyright (C) 2005-2013 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) @@ -17,7 +17,7 @@ gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico gnu7.ico gnu8.ico gnu9.ico Author: Rob Davenport -Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. +Copyright (C) 1999, 2001-2013 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) === modified file 'src/fns.c' --- src/fns.c 2012-12-21 19:32:43 +0000 +++ src/fns.c 2013-01-03 02:37:57 +0000 @@ -1,6 +1,6 @@ /* Random utility Lisp functions. - Copyright (C) 1985-1987, 1993-1995, 1997-2012 - Free Software Foundation, Inc. + +Copyright (C) 1985-1987, 1993-1995, 1997-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.