From: Paul Eggert Date: Wed, 2 Jan 2013 16:13:04 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca X-Git-Tag: emacs-24.3.90~173^2~7^2~424 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/0877d0dc24ee792b9b14592869ea1aa0934aee58 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca --- 0877d0dc24ee792b9b14592869ea1aa0934aee58 diff --cc doc/lispref/ChangeLog index 2036831cb8,6884ff943f..1820f30442 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,12 +1,12 @@@ + 2012-12-31 Glenn Morris + + * customize.texi (Common Keywords, Type Keywords): + Replace "active field" with "button". (Bug#13310) + + * customize.texi (Common Keywords): Add xref. (Bug#13311) + * tips.texi (Library Headers): Add cindex. + -2012-12-29 Wolfgang Jenkner +2012-12-30 Wolfgang Jenkner * functions.texi (Declare Form): * intro.texi (A Sample Function Description): diff --cc doc/misc/ses.texi index 826fac20c7,f6c35d1de8..ce75f2ef91 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@@ -9,9 -9,9 +9,9 @@@ @c %**end of header @copying -This file documents SES: the Simple Emacs Spreadsheet. +This file documents @acronym{SES}: the Simple Emacs Spreadsheet. - Copyright @copyright{} 2002--2012 Free Software Foundation, Inc. + Copyright @copyright{} 2002--2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --cc etc/MH-E-NEWS index 4d003378c3,785a856e98..846504c901 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@@ -1,70 -1,8 +1,70 @@@ * COPYRIGHT - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2013 Free Software Foundation, Inc. See the end of the file for license conditions. +* Changes in MH-E 8.4 + +Version 8.4 postpones junk processing and merges in your components +file when re-editing a draft. A few bugs were also fixed. + +** New Features in MH-E 8.4 + +*** Postpone junk processing + +The `J w' (`mh-junk-whitelist') and `J b' (`mh-junk-blacklist') +commands now mark the message. Like with other marks, this mark can be +removed with `u' (`mh-undo') and processed with `x' +(`mh-execute-commands'). Thanks to Ted Phelps (closes SF #2945712). + +** New Variables in MH-E 8.4 + +*** mh-blacklist-msg-hook + +Hook run by `J b' (`mh-junk-blacklist') after marking each message for blacklisting. + +*** mh-whitelist-msg-hook + +Hook run by `J w' (`mh-junk-whitelist') after marking each message for whitelisting. + +*** mh-whitelist-preserves-sequences-flag + +Non-nil means that sequences are preserved when messages are +whitelisted. + +** New Faces in MH-E 8.4 + +*** mh-folder-blacklisted + +Blacklisted message face. + +*** mh-folder-whitelisted + +Whitelisted message face. + +** Bug Fixes in MH-E 8.4 + +*** mh-edit-again should add Fcc + +More generally, `mh-edit-again' now merges the components file into +the draft (closes SF #1708292). + +*** Loses changes when message column goes from 1 to 2 digits + +Call `mh-process-or-undo-commands' before running inc to insure we do +not lose any pending changes (closes SF #2321115). + +*** mh-yank-cur-msg fails in emacs 23 + +Replace usage of `set-buffer' with `with-current-buffer' (closes SF +#2830504). + +*** Folder pack action (Fp) missing in show mode + +Add missing key binding for `mh-show-pack-folder' (closes SF #3466086). + + + * Changes in MH-E 8.3.1 This version of MH-E fixes typos in the documentation and is packaged diff --cc lisp/ChangeLog index 72e8959d8e,35fe446f06..00bce0b62b --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,50 -1,44 +1,91 @@@ + 2012-12-31 Andreas Schwab + + * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as + defun. Don't check for DECL if DOCSTRING isn't a string. + (defun): Likewise. + + 2012-12-31 Glenn Morris + + * eshell/em-cmpl.el (eshell-pcomplete): + More thoroughly imitate pcomplete. (Bug#13293) + + * files.el (parse-colon-path): Doc fix. (Bug#12351) + Return nil for empty path elements. (Bug#13296) + + 2012-12-31 Fabián Ezequiel Gallina + + * progmodes/python.el (python-nav-end-of-statement): Rewrite in + order to improve efficiency (Based on Daniel Colascione's + patch). (Bug#13182) + + 2012-12-31 Glenn Morris + + * vc/log-edit.el (log-edit-header-contents-regexp): Add doc string. + + 2012-12-31 Fabián Ezequiel Gallina + + * progmodes/python.el: Support other commands triggering + python-indent-line so indentation cycling continues to work. + (python-indent-trigger-commands): New defcustom. + (python-indent-line): Use it. + + 2012-12-31 Fabián Ezequiel Gallina + + * progmodes/python.el (python-shell-send-region): Add blank lines + for non sent code so backtraces remain correct. + + 2012-12-31 Andreas Schwab + + * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if + neither DOCSTRING nor DECL was given. (Bug#13316) + +2013-01-02 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-set-file-acl): Add argument to + `error' call. + (tramp-do-copy-or-rename-file): Ignore errors when calling + `set-file-extended-attributes'. + + * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add + handler for `file-acl'. + (tramp-smb-handle-file-acl): New defun. + +2013-01-02 Jay Belanger + + * calc/README: Mention ISO 8601 week-numbering dates. + +2013-01-01 Martin Rudalics + + * view.el (view-mode-enable): New argument run-view-mode-hook. + Run view-mode-hook only when it's non-nil (Bug#13315). + (view-mode-enter): Call view-mode-enable with run-view-mode-hook + argument t. + +2012-12-31 Jürgen Hötzel + + * net/tramp-adb.el (tramp-adb-maybe-open-connection): Handle errors + (No device connected, invalid device name). (Bug #13299) + +2012-12-31 Martin Rudalics + + * window.el (window-resizable--p): Rename to window-resizable-p. + (window-resize-no-error): New function. + + * mail/rmail.el (rmail-maybe-display-summary): Restore behavior + broken in fix from 2012-12-28. + +2012-12-31 Stefan Monnier + + * subr.el (special-form-p): Don't signal errors on undef aliases. + +2012-12-31 Jay Belanger + + * calc/calc-forms.el (math-parse-date): Try using + `math-parse-iso-date' when it looks like it might be needed. + Allow times of 24:00. + (math-parse-date-validate, math-parse-iso-date-validate): Allow times + of 24:00. + 2012-12-30 Glenn Morris * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary): diff --cc lisp/dired.el index 93f302329e,3d01c7b092..b8b8a7f877 --- a/lisp/dired.el +++ b/lisp/dired.el @@@ -4295,7 -4294,7 +4295,7 @@@ instead ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) - ;;;;;; "dired-x" "dired-x.el" "a0a769bf895afcbb6d0e05169ef81923") -;;;;;; "dired-x" "dired-x.el" "ce753ade80ea9f4e64ab3569e3a5421e") ++;;;;;; "dired-x" "dired-x.el" "cdaacce7c861256289ba48493dd6d0ec") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ diff --cc lisp/emacs-lisp/advice.el index a947dceccc,eb95fae233..7917b769ab --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@@ -1,6 -1,6 +1,6 @@@ -;;; advice.el --- An overloading mechanism for Emacs Lisp functions +;;; advice.el --- An overloading mechanism for Emacs Lisp functions -*- lexical-binding: t -*- - ;; Copyright (C) 1993-1994, 2000-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1993-1994, 2000-2013 Free Software Foundation, Inc. ;; Author: Hans Chalupsky ;; Maintainer: FSF diff --cc lisp/emacs-lisp/cl-loaddefs.el index f699ee7fb8,4198c0e006..734975f7f1 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@@ -11,7 -11,7 +11,7 @@@ ;;;;;; cl--map-overlays cl--map-intervals cl--map-keymap-recursively ;;;;;; cl-notevery cl-notany cl-every cl-some cl-mapcon cl-mapcan ;;;;;; cl-mapl cl-mapc cl-maplist cl-map cl--mapcar-many cl-equalp - ;;;;;; cl-coerce) "cl-extra" "cl-extra.el" "3ee58411735a01dd1e1d3964fdcfae70") -;;;;;; cl-coerce) "cl-extra" "cl-extra.el" "6c7926a10c377679687a2ab6a4d1c186") ++;;;;;; cl-coerce) "cl-extra" "cl-extra.el" "c5730f2a706cb1efc5fec0a790d3ca72") ;;; Generated autoloads from cl-extra.el (autoload 'cl-coerce "cl-extra" "\ @@@ -267,7 -267,7 +267,7 @@@ including `cl-block' and `cl-eval-when' ;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when ;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp ;;;;;; cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*) - ;;;;;; "cl-macs" "cl-macs.el" "d3af72b1cff3398fa1480065fc2887a2") -;;;;;; "cl-macs" "cl-macs.el" "ad8afd35d8d75f5f22e7547b02bac556") ++;;;;;; "cl-macs" "cl-macs.el" "3b4d4e869f81f0b07ab3aa08f5478c2e") ;;; Generated autoloads from cl-macs.el (autoload 'cl--compiler-macro-list* "cl-macs" "\ @@@ -772,7 -759,7 +772,7 @@@ surrounded by (cl-block NAME ...) ;;;;;; cl-nsubstitute-if cl-nsubstitute cl-substitute-if-not cl-substitute-if ;;;;;; cl-substitute cl-delete-duplicates cl-remove-duplicates cl-delete-if-not ;;;;;; cl-delete-if cl-delete cl-remove-if-not cl-remove-if cl-remove - ;;;;;; cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "4b8ddc5bea2fcc626526ce3644071568") -;;;;;; cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "5ce2761d9a21845a7f6a2da0e4543844") ++;;;;;; cl-replace cl-fill cl-reduce) "cl-seq" "cl-seq.el" "51a70dea9cbc225165a50135956609aa") ;;; Generated autoloads from cl-seq.el (autoload 'cl-reduce "cl-seq" "\ diff --cc lisp/emacs-lisp/debug.el index a378941a5a,472706d886..0728e86d07 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@@ -1,6 -1,7 +1,7 @@@ -;;; debug.el --- debuggers and related commands for Emacs +;;; debug.el --- debuggers and related commands for Emacs -*- lexical-binding: t -*- - ;; Copyright (C) 1985-1986, 1994, 2001-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1985-1986, 1994, 2001-2013 Free Software Foundation, + ;; Inc. ;; Maintainer: FSF ;; Keywords: lisp, tools, maint diff --cc lisp/emacs-lisp/elp.el index 067b45f5cd,bc02d9a755..f1321eb4e6 --- a/lisp/emacs-lisp/elp.el +++ b/lisp/emacs-lisp/elp.el @@@ -1,7 -1,7 +1,7 @@@ -;;; elp.el --- Emacs Lisp Profiler +;;; elp.el --- Emacs Lisp Profiler -*- lexical-binding: t -*- - ;; Copyright (C) 1994-1995, 1997-1998, 2001-2012 - ;; Free Software Foundation, Inc. + ;; Copyright (C) 1994-1995, 1997-1998, 2001-2013 Free Software + ;; Foundation, Inc. ;; Author: Barry A. Warsaw ;; Maintainer: FSF diff --cc lisp/emacs-lisp/ert-x.el index 60d74774e8,00100c0f6f..531e83c1e6 --- a/lisp/emacs-lisp/ert-x.el +++ b/lisp/emacs-lisp/ert-x.el @@@ -1,6 -1,6 +1,6 @@@ -;;; ert-x.el --- Staging area for experimental extensions to ERT +;;; ert-x.el --- Staging area for experimental extensions to ERT -*- lexical-binding: t -*- - ;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc. + ;; Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc. ;; Author: Lennart Borgman (lennart O borgman A gmail O com) ;; Christian Ohler diff --cc lisp/emacs-lisp/ert.el index ab6dcb5814,134dbc1b6a..70d6a6a4a5 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@@ -1,6 -1,6 +1,6 @@@ -;;; ert.el --- Emacs Lisp Regression Testing +;;; ert.el --- Emacs Lisp Regression Testing -*- lexical-binding: t -*- - ;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc. + ;; Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc. ;; Author: Christian Ohler ;; Keywords: lisp, tools diff --cc lisp/emacs-lisp/trace.el index 722e6270e9,53d849cf74..d2566b8cb9 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@@ -1,6 -1,6 +1,6 @@@ -;;; trace.el --- tracing facility for Emacs Lisp functions +;;; trace.el --- tracing facility for Emacs Lisp functions -*- lexical-binding: t -*- - ;; Copyright (C) 1993, 1998, 2000-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1993, 1998, 2000-2013 Free Software Foundation, Inc. ;; Author: Hans Chalupsky ;; Maintainer: FSF diff --cc lisp/hi-lock.el index 2ae328a09e,476399225f..e794861424 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@@ -1,6 -1,6 +1,6 @@@ -;;; hi-lock.el --- minor mode for interactive automatic highlighting +;;; hi-lock.el --- minor mode for interactive automatic highlighting -*- lexical-binding: t -*- - ;; Copyright (C) 2000-2012 Free Software Foundation, Inc. + ;; Copyright (C) 2000-2013 Free Software Foundation, Inc. ;; Author: David M. Koppelman ;; Keywords: faces, minor-mode, matching, display diff --cc lisp/json.el index 8432ba40c1,a0cd116279..29beaedebe --- a/lisp/json.el +++ b/lisp/json.el @@@ -1,9 -1,9 +1,9 @@@ ;;; json.el --- JavaScript Object Notation parser / generator - ;; Copyright (C) 2006-2012 Free Software Foundation, Inc. + ;; Copyright (C) 2006-2013 Free Software Foundation, Inc. ;; Author: Edward O'Connor -;; Version: 1.3 +;; Version: 1.4 ;; Keywords: convenience ;; This file is part of GNU Emacs. diff --cc lisp/mail/rmail.el index 947d8e2cb4,2524b1939a..a05cd34286 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@@ -4577,7 -4552,7 +4577,7 @@@ encoded string (and the same mask) wil ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" - ;;;;;; "791ea184628feb6335fe3e29f7234934") -;;;;;; "1aec1d54f9767ee0fea557bbfb1d547b") ++;;;;;; "0b056146d4775080a1847b8ce7527bc5") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ diff --cc lisp/mail/unrmail.el index fd7e49a65d,f6347d1105..85e8bb4f86 --- a/lisp/mail/unrmail.el +++ b/lisp/mail/unrmail.el @@@ -1,6 -1,6 +1,6 @@@ -;;; unrmail.el --- convert Rmail Babyl files to mailbox files +;;; unrmail.el --- convert Rmail Babyl files to mbox files - ;; Copyright (C) 1992, 2001-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1992, 2001-2013 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: mail diff --cc lisp/progmodes/perl-mode.el index 46940457d3,2ee7734e40..bd58a7300e --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@@ -1,6 -1,6 +1,6 @@@ -;;; perl-mode.el --- Perl code editing commands for GNU Emacs +;;; perl-mode.el --- Perl code editing commands for GNU Emacs -*- coding: utf-8 -*- - ;; Copyright (C) 1990, 1994, 2001-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1990, 1994, 2001-2013 Free Software Foundation, Inc. ;; Author: William F. Mann ;; Maintainer: FSF diff --cc lisp/progmodes/sql.el index 9765b614b9,52d29746ed..453386cdba --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@@ -1,6 -1,6 +1,6 @@@ -;;; sql.el --- specialized comint.el for SQL interpreters +;;; sql.el --- specialized comint.el for SQL interpreters -*- lexical-binding: t -*- - ;; Copyright (C) 1998-2012 Free Software Foundation, Inc. + ;; Copyright (C) 1998-2013 Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Maintainer: Michael Mauger diff --cc src/ChangeLog index 183d972834,ea88277076..d967bebff1 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,58 -1,8 +1,62 @@@ + 2012-12-31 Glenn Morris + + * keymap.c (Fkey_description): Doc fix. (Bug#13323) + -2012-12-29 Andreas Schwab +2013-01-02 Paul Eggert + + Simplify via eabs. + * dired.c (file_name_completion): + * doc.c (get_doc_string): + * floatfns.c (round2): + * font.c (font_score, font_delete_unmatched): + * fringe.c (compute_fringe_widths): + * lread.c (read_list): + * minibuf.c (Ftry_completion): + * term.c (tty_ins_del_lines): + * xterm.c (x_draw_image_foreground, x_draw_image_foreground_1): + Use eabs (x) rather than open-coding it as (x < 0 ? -x : x). + +2012-12-31 Eli Zaretskii + + * w32.c (unsetenv): Set up the string passed to _putenv + correctly. See + http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html + for the bug this caused. + +2012-12-30 Paul Eggert + + * coding.c (Qmac): Now static. + +2012-12-30 Jan Djärv + + * gtkutil.c (TOOLBAR_TOP_WIDGET): New macro. + (xg_pack_tool_bar): Use TOOLBAR_TOP_WIDGET, condition out use of + handlebox_widget. Set toolbar_in_hbox to false/true, set + toolbar_is_packed to true. + (xg_update_tool_bar_sizes): Use widget returned by TOOLBAR_TOP_WIDGET. + (update_frame_tool_bar): Check toolbar_is_packed for packing. + Show all on TOOLBAR_TOP_WIDGET. + (free_frame_tool_bar): Check toolbar_is_packed. Use widget returned + by TOOLBAR_TOP_WIDGET. + (xg_change_toolbar_position): Use widget returned by TOOLBAR_TOP_WIDGET. + Check toolbar_is_packed. + (xg_have_tear_offs, tearoff_remove, tearoff_activate): Condition on + HAVE_GTK_TEAROFF_MENU_ITEM_NEW. + (xg_have_tear_offs): When ! HAVE_GTK_TEAROFF_MENU_ITEM_NEW, return + false. + (create_menus): Create tearoff only if HAVE_GTK_TEAROFF_MENU_ITEM_NEW. + (xg_update_menubar): Update title only if + HAVE_GTK_TEAROFF_MENU_ITEM_NEW. + (xg_update_submenu): Skip tearoff only if + HAVE_GTK_TEAROFF_MENU_ITEM_NEW. + (xg_initialize): Initialize xg_detached_menus only if + HAVE_GTK_TEAROFF_MENU_ITEM_NEW. + + * xterm.h (struct x_output): Surround handlebox_widget with + #ifdef HAVE_GTK_HANDLE_BOX_NEW. toolbar_is_packed is new, + toolbar_in_hbox is bool. + +2012-12-30 Andreas Schwab * src/Makefile.in (TEMACS_LDFLAGS2): Remove. (LIBS_GNUSTEP): Define. diff --cc test/automated/ert-tests.el index 1aef192187,6be14f6097..0c3c3692c1 --- a/test/automated/ert-tests.el +++ b/test/automated/ert-tests.el @@@ -1,6 -1,6 +1,6 @@@ -;;; ert-tests.el --- ERT's self-tests +;;; ert-tests.el --- ERT's self-tests -*- lexical-binding: t -*- - ;; Copyright (C) 2007-2008, 2010-2012 Free Software Foundation, Inc. + ;; Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc. ;; Author: Christian Ohler