commit 50e844ce73f4c4287877816fa7753ef4930ed55c (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Tue Sep 29 10:08:29 2015 +0300 * nt/INSTALL: Add instructions for installing Git. diff --git a/nt/INSTALL b/nt/INSTALL index da15040..446f2f8 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -75,6 +75,48 @@ build will run on Windows 9X and newer systems). If these short instructions somehow fail, read the rest of this file. +* Installing Git for Windows + + Skip this section if you already have Git installed and configured, + or if you are building from the release tarball, not from the + development repository. + + Git for Windows is available from this download page: + + https://github.com/git-for-windows/git/releases + + That page offers both 32-bit and 64-bit installations; pick the one + suitable for your OS. In general, we recommend to install a 64-bit + Git if you have a 64-bit Windows system; the 32-bit Git will run on + 64-bit Windows just fine, but might run into memory problems where + the 64-bit Git won't. + + During Git installation, be sure to select the "Checkout as-is, + commit as-is" option from the "Configure line ending conversions" + dialog. Otherwise, Git will convert text files to DOS-style CRLF + end-of-line (EOL) format, which will cause subtle problems when + building Emacs, because MSYS tools (see below) used to build Emacs + use binary file I/O that preserves the CR characters that get in the + way of some text-processing tools, like 'makeinfo' and the commands + invoked by the autogen.sh script. + + If you already have Git installed and configured with some other EOL + conversion option, you will need to reconfigure it, removing the + following variables from all of your .gitconfig files: + + core.eol + core.safecrlf + core.autocrlf + + If you cloned the Emacs directory before changing these config + variables, you will have to delete the repository and re-clone it + after the change. + + The instructions for cloning the Emacs repository can be found on + the Emacs's Savannah project page: + + https://savannah.gnu.org/projects/emacs + * Installing MinGW and MSYS Make sure you carefully read the following two sections in their @@ -143,7 +185,7 @@ build will run on Windows 9X and newer systems). optional libraries near the end of this document, before you start the build. Also, consider installing additional MinGW packages that are required/recommended, especially if you are building from the - repository, as described in the next section. + development repository, as described in the next section. ** Installing MinGW and MSYS manually @@ -187,7 +229,7 @@ build will run on Windows 9X and newer systems). been warned! Additional MinGW packages are required/recommended, especially if - you are building from the repository: + you are building from the development repository: . Texinfo (needed to produce the Info manuals when building from the repository, and for "make install") commit 8b95ee49bc1d632a34230b367be53a97060ebe7e Author: Katsumi Yamaoka Date: Tue Sep 29 06:30:48 2015 +0000 * net/shr.el (shr-colorize-region): Allow 88-color tty to use colors. Suggested by Eli Zaretskii. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index ebc8ab3..60203f5 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1042,7 +1042,7 @@ ones, in case fg and bg are nil." (shr-color-visible bg fg))))))) (defun shr-colorize-region (start end fg &optional bg) - (when (and (or fg bg) (>= (display-color-cells) 256)) + (when (and (or fg bg) (>= (display-color-cells) 88)) (let ((new-colors (shr-color-check fg bg))) (when new-colors (when fg commit 888d644f0ba53ba4f4160dc0bdfda384936ded58 Author: Katsumi Yamaoka Date: Tue Sep 29 02:01:50 2015 +0000 * net/shr.el (shr-colorize-region): Don't do it on a system not supporting 256 above colors (bug#21557). diff --git a/lisp/net/shr.el b/lisp/net/shr.el index fb450e8..ebc8ab3 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1042,7 +1042,7 @@ ones, in case fg and bg are nil." (shr-color-visible bg fg))))))) (defun shr-colorize-region (start end fg &optional bg) - (when (or fg bg) + (when (and (or fg bg) (>= (display-color-cells) 256)) (let ((new-colors (shr-color-check fg bg))) (when new-colors (when fg commit 166a6556d0ec9926035aa2bce3dc0b0827b447ef Author: Dmitry Gutov Date: Tue Sep 29 01:39:14 2015 +0300 ; Remove extraneous "coding: utf-8" specifications in Elisp files diff --git a/admin/authors.el b/admin/authors.el index 092da68..3d7850a 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -1,4 +1,4 @@ -;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*- +;;; authors.el --- utility for maintaining Emacs's AUTHORS file ;; Copyright (C) 2000-2015 Free Software Foundation, Inc. diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el index d49f9bf..734731a 100644 --- a/etc/themes/wombat-theme.el +++ b/etc/themes/wombat-theme.el @@ -1,4 +1,4 @@ -;;; wombat-theme.el --- Custom face theme for Emacs -*-coding: utf-8 -*- +;;; wombat-theme.el --- Custom face theme for Emacs ;; Copyright (C) 2011-2015 Free Software Foundation, Inc. diff --git a/lisp/battery.el b/lisp/battery.el index b9ce5b4..b33e906 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -1,4 +1,4 @@ -;;; battery.el --- display battery status information -*- coding: utf-8 -*- +;;; battery.el --- display battery status information ;; Copyright (C) 1997-1998, 2000-2015 Free Software Foundation, Inc. diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el index 2319c48..6336c33 100644 --- a/lisp/calc/calc-aent.el +++ b/lisp/calc/calc-aent.el @@ -1266,7 +1266,6 @@ If the current Calc language does not use placeholders, return nil." (provide 'calc-aent) ;; Local variables: -;; coding: utf-8 ;; generated-autoload-file: "calc-loaddefs.el" ;; End: diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 933c446..9adf66f 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -3507,8 +3507,4 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.") (provide 'calc-ext) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calc-ext.el ends here diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index 6b3b949..9436606 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -2525,8 +2525,4 @@ order to Calc's." (provide 'calc-lang) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calc-lang.el ends here diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el index 21209c6..2684e62 100644 --- a/lisp/calc/calc-store.el +++ b/lisp/calc/calc-store.el @@ -677,8 +677,4 @@ (provide 'calc-store) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calc-store.el ends here diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 4373e52..a450d8f 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -2163,8 +2163,4 @@ If non-nil, return a list consisting of the note and the cents coefficient." (provide 'calc-units) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calc-units.el ends here diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index b4b0ad8..de7bfb8 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -3918,8 +3918,4 @@ See Info node `(calc)Defining Functions'." (provide 'calc) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calc.el ends here diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el index a3432c1..119f419 100644 --- a/lisp/calc/calccomp.el +++ b/lisp/calc/calccomp.el @@ -1670,8 +1670,4 @@ (provide 'calccomp) -;; Local variables: -;; coding: utf-8 -;; End: - ;;; calccomp.el ends here diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index 998dc6c..d0b3021 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -324,8 +324,4 @@ Prefix argument ARG will make the entry nonmarking." (provide 'cal-bahai) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; cal-bahai.el ends here diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el index b88adb9..33e8e8e 100644 --- a/lisp/calendar/cal-french.el +++ b/lisp/calendar/cal-french.el @@ -256,8 +256,4 @@ Echo French Revolutionary date unless NOECHO is non-nil." (provide 'cal-french) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; cal-french.el ends here diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index 251d811..211f16c 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -280,8 +280,4 @@ is non-nil." (provide 'cal-menu) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; cal-menu.el ends here diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 86e5477..f188b68 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2635,7 +2635,6 @@ If called by a mouse-event, pops up a menu with the result." ;; Local variables: ;; byte-compile-dynamic: t -;; coding: utf-8 ;; End: ;;; calendar.el ends here diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index a1370bb..7382abf 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2534,8 +2534,4 @@ entry is found the user is asked to confirm its addition." (provide 'diary-lib) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; diary-lib.el ends here diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index bd3a558..307ab4d 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -823,8 +823,4 @@ arguments, it returns the date of Pascha (Greek Orthodox Easter)." (provide 'holidays) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; holidays.el ends here diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 4b71530..0955e72 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -1,4 +1,4 @@ -;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*- +;;; icalendar.el --- iCalendar implementation ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. diff --git a/lisp/color.el b/lisp/color.el index 3471243..d572222 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -1,4 +1,4 @@ -;;; color.el --- Color manipulation library -*- coding: utf-8; lexical-binding:t -*- +;;; color.el --- Color manipulation library -*- lexical-binding:t -*- ;; Copyright (C) 2010-2015 Free Software Foundation, Inc. diff --git a/lisp/desktop.el b/lisp/desktop.el index 9d023e3..e95a8c9 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1590,7 +1590,3 @@ If there are no buffers left to create, kill the timer." (provide 'desktop) ;;; desktop.el ends here - -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/lisp/dnd.el b/lisp/dnd.el index 3e161dc..d4fb088 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -1,4 +1,4 @@ -;;; dnd.el --- drag and drop support. -*- coding: utf-8 -*- +;;; dnd.el --- drag and drop support ;; Copyright (C) 2005-2015 Free Software Foundation, Inc. diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 0f75f0a..efa9a3d 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -1,4 +1,4 @@ -;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t; coding: utf-8 -*- +;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t -*- ;; Copyright (C) 2011-2015 Free Software Foundation, Inc. diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index d5d8ef0..c42094f 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -1,4 +1,4 @@ -;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t; coding: utf-8 -*- +;;; cl-macs.el --- Common Lisp macros -*- lexical-binding: t -*- ;; Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 1317d69..50f880d 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -375,9 +375,4 @@ If FIX is non-nil, run `copyright-fix-years' instead." (provide 'copyright) -;; For the copyright sign: -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; copyright.el ends here diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 2c33d39..8bf49b0 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -1,4 +1,4 @@ -;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t; coding: utf-8 -*- +;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*- ;; ;; Copyright (C) 2004-2015 Free Software Foundation, Inc. ;; diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index ea4f38a..8bcb447 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -1,4 +1,4 @@ -;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t; coding: utf-8 -*- +;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t -*- ;; Copyright (C) 2010-2015 Free Software Foundation, Inc. diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 17e3be7..229bb58 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -286,7 +286,3 @@ version unless you know what you are doing.\n") (provide 'shadow) ;;; shadow.el ends here - -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index cd61eb9..47ecd2b 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -581,8 +581,4 @@ as the ewoc pretty-printer." (provide 'tabulated-list) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; tabulated-list.el ends here diff --git a/lisp/filesets.el b/lisp/filesets.el index ab332bb..28d0cd8 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -1,4 +1,4 @@ -;;; filesets.el --- handle group of files -*- coding: utf-8 -*- +;;; filesets.el --- handle group of files ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. diff --git a/lisp/fringe.el b/lisp/fringe.el index 8f40c46..8524f2a 100644 --- a/lisp/fringe.el +++ b/lisp/fringe.el @@ -1,4 +1,4 @@ -;;; fringe.el --- fringe setup and control -*- coding: utf-8 -*- +;;; fringe.el --- fringe setup and control ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 0a0a0b3..719cb50a 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -2433,8 +2433,4 @@ Use a fallback method for obtaining the rgb values for a color. (provide 'htmlfontify) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; htmlfontify.el ends here diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 5065b66..92eb068 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2974,8 +2974,4 @@ defaults to one. (run-hooks 'ibuffer-load-hook) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; ibuffer.el ends here diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index 86bb9e8..839e24c 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -1,4 +1,4 @@ -;;; footnote.el --- footnote support for message mode -*- coding: utf-8;-*- +;;; footnote.el --- footnote support for message mode ;; Copyright (C) 1997, 2000-2015 Free Software Foundation, Inc. diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index a7057ca..3513898 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1,4 +1,4 @@ -;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*- +;;; mail-extr.el --- extract full name and address from RFC 822 mail header ;; Copyright (C) 1991-1994, 1997, 2001-2015 Free Software Foundation, ;; Inc. diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 4c0f2b9..9269d7f 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -2078,7 +2078,6 @@ you can move to one of them and type C-c C-c to recover that one." ;; Local Variables: ;; byte-compile-dynamic: t -;; coding: utf-8 ;; End: ;;; sendmail.el ends here diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el index 74939d1..5db1357 100644 --- a/lisp/mail/uce.el +++ b/lisp/mail/uce.el @@ -375,7 +375,3 @@ You might need to set `uce-mail-reader' before using this." (provide 'uce) ;;; uce.el ends here - -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/lisp/man.el b/lisp/man.el index fbfa6f0..90d658a 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1,4 +1,4 @@ -;;; man.el --- browse UNIX manual pages -*- coding: utf-8 -*- +;;; man.el --- browse UNIX manual pages ;; Copyright (C) 1993-1994, 1996-1997, 2001-2015 Free Software ;; Foundation, Inc. diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el index f01f671..e48af4d 100644 --- a/lisp/net/eudc-bob.el +++ b/lisp/net/eudc-bob.el @@ -1,4 +1,4 @@ -;;; eudc-bob.el --- Binary Objects Support for EUDC -*- coding: utf-8 -*- +;;; eudc-bob.el --- Binary Objects Support for EUDC ;; Copyright (C) 1999-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el index ec0914d..c60911f 100644 --- a/lisp/net/eudc-export.el +++ b/lisp/net/eudc-export.el @@ -1,4 +1,4 @@ -;;; eudc-export.el --- functions to export EUDC query results -*- coding: utf-8 -*- +;;; eudc-export.el --- functions to export EUDC query results ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index 7416ad0..55a2fd9 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -1,4 +1,4 @@ -;;; eudc-hotlist.el --- hotlist management for EUDC -*- coding: utf-8 -*- +;;; eudc-hotlist.el --- hotlist management for EUDC ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index 5e994a3..8cffa8e 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -1,4 +1,4 @@ -;;; eudc-vars.el --- Emacs Unified Directory Client -*- coding: utf-8 -*- +;;; eudc-vars.el --- Emacs Unified Directory Client ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el index 66dbc65..7280d9d 100644 --- a/lisp/net/eudc.el +++ b/lisp/net/eudc.el @@ -1,4 +1,4 @@ -;;; eudc.el --- Emacs Unified Directory Client -*- coding: utf-8 -*- +;;; eudc.el --- Emacs Unified Directory Client ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el index bd5d453..0545304 100644 --- a/lisp/net/eudcb-bbdb.el +++ b/lisp/net/eudcb-bbdb.el @@ -1,4 +1,4 @@ -;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -*- coding: utf-8 -*- +;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el index d22dff6..b50d29d 100644 --- a/lisp/net/eudcb-ldap.el +++ b/lisp/net/eudcb-ldap.el @@ -1,4 +1,4 @@ -;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -*- coding: utf-8 -*- +;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el index a135e9b..f144bf6 100644 --- a/lisp/net/eudcb-ph.el +++ b/lisp/net/eudcb-ph.el @@ -1,4 +1,4 @@ -;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -*- coding: utf-8 -*- +;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend ;; Copyright (C) 1998-2015 Free Software Foundation, Inc. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 0ce77b9..fb450e8 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -2050,8 +2050,4 @@ The preference is a float determined from `shr-prefer-media-type'." (provide 'shr) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; shr.el ends here diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el index 358d0fc..3df786e 100644 --- a/lisp/obsolete/iso-insert.el +++ b/lisp/obsolete/iso-insert.el @@ -1,4 +1,4 @@ -;;; iso-insert.el --- insert functions for ISO 8859/1 -*- coding: utf-8;-*- +;;; iso-insert.el --- insert functions for ISO 8859/1 ;; Copyright (C) 1987, 1994, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 0258f1e..a07b381 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -1,4 +1,4 @@ -;;; 5x5.el --- simple little puzzle game -*- coding: utf-8 -*- +;;; 5x5.el --- simple little puzzle game ;; Copyright (C) 1999-2015 Free Software Foundation, Inc. diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el index 1e06f1b..4dc4c77 100644 --- a/lisp/play/bubbles.el +++ b/lisp/play/bubbles.el @@ -1,4 +1,4 @@ -;;; bubbles.el --- Puzzle game for Emacs -*- coding: utf-8 -*- +;;; bubbles.el --- Puzzle game for Emacs ;; Copyright (C) 2007-2015 Free Software Foundation, Inc. diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index 62a8fe4..30e8357 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el @@ -1,4 +1,4 @@ -;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: utf-8; -*- +;;; handwrite.el --- turns your emacs buffer into a handwritten document ;; Copyright (C) 1996, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/play/morse.el b/lisp/play/morse.el index bbd3e6b..e35147d 100644 --- a/lisp/play/morse.el +++ b/lisp/play/morse.el @@ -1,4 +1,4 @@ -;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*- +;;; morse.el --- convert text to morse code and back ;; Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el index 0f5b1bb..9953cae 100644 --- a/lisp/progmodes/cmacexp.el +++ b/lisp/progmodes/cmacexp.el @@ -405,7 +405,3 @@ Optional arg DISPLAY non-nil means show messages in the echo area." (kill-buffer outbuf)))) ;;; cmacexp.el ends here - -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 0ac59e1..5c938fd 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -2382,8 +2382,4 @@ escape character." (provide 'f90) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; f90.el ends here diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 845abc0..dba497b 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -1,4 +1,4 @@ -;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- coding: utf-8 -*- +;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks ;; Copyright (C) 1994-2015 Free Software Foundation, Inc. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index ab994f3..f214015 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3571,8 +3571,4 @@ If one hasn't been set, or if it's stale, prompt for a new one." (provide 'js) -;; Local Variables: -;; coding: utf-8 -;; End: - ;; js.el ends here diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b641e30..6ff12b5 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -5123,7 +5123,6 @@ returned as is." (provide 'python) ;; Local Variables: -;; coding: utf-8 ;; indent-tabs-mode: nil ;; End: diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el index 4f68909..f1b5da4 100644 --- a/lisp/ruler-mode.el +++ b/lisp/ruler-mode.el @@ -775,8 +775,4 @@ Optional argument PROPS specifies other text properties to apply." (provide 'ruler-mode) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; ruler-mode.el ends here diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 69bd500..67d9fac 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el @@ -1,4 +1,4 @@ -;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*- +;;; skeleton.el --- Lisp language extension for writing statement skeletons ;; Copyright (C) 1993-1996, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/subr.el b/lisp/subr.el index b1b3638..e176907 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1,4 +1,4 @@ -;;; subr.el --- basic lisp subroutines for Emacs -*- coding: utf-8; lexical-binding:t -*- +;;; subr.el --- basic lisp subroutines for Emacs -*- lexical-binding:t -*- ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2015 Free Software ;; Foundation, Inc. diff --git a/lisp/tempo.el b/lisp/tempo.el index 6e2f978..93df15a 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -759,7 +759,3 @@ space bar, and looks something like this: (provide 'tempo) ;;; tempo.el ends here - -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index ebd76a6..5eb6f11 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1,4 +1,4 @@ -;;; x-win.el --- parse relevant switches and set up for X -*-coding: utf-8; lexical-binding:t -*- +;;; x-win.el --- parse relevant switches and set up for X -*- lexical-binding:t -*- ;; Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc. diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 770571a..7d81bbc 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,4 +1,4 @@ -;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- coding: utf-8 -*- +;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files ;; Copyright (C) 2004-2015 Free Software Foundation, Inc. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 5f2fbcd..a97facf 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1,4 +1,4 @@ -;;; fill.el --- fill commands for Emacs -*- coding: utf-8 -*- +;;; fill.el --- fill commands for Emacs ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2015 Free ;; Software Foundation, Inc. diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index 8bcc71e..58c6567 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -536,8 +536,4 @@ the current sentence with the one containing the mark." (interactive "*p") (transpose-subr 'forward-sentence arg)) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; paragraphs.el ends here diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index 99ec291..a5f3946 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,4 +1,4 @@ -;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*- +;;; po.el --- basic support of PO translation files ;; Copyright (C) 1995-1998, 2000-2015 Free Software Foundation, Inc. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index bf15b26..cbeded2 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,4 +1,4 @@ -;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- +;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2015 Free ;; Software Foundation, Inc. diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 5721817..2b606ed 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -1,4 +1,4 @@ -;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*- +;;; texinfo.el --- major mode for editing Texinfo files ;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2015 Free Software ;; Foundation, Inc. diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 0e645fc..f1a42f2 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -508,9 +508,4 @@ variable will be set to the representation." (provide 'tildify) - -;; Local variables: -;; coding: utf-8 -;; End: - ;;; tildify.el ends here diff --git a/lisp/time.el b/lisp/time.el index d35f5b9..dec5940 100644 --- a/lisp/time.el +++ b/lisp/time.el @@ -1,4 +1,4 @@ -;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*- +;;; time.el --- display time, load and mail indicator in mode line of Emacs ;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2015 Free Software ;; Foundation, Inc. diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index dc43094..cf1f49c 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el @@ -1,4 +1,4 @@ -;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8; lexical-binding: t -*- +;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*- ;; Copyright (C) 1999-2015 Free Software Foundation, Inc. diff --git a/lisp/wdired.el b/lisp/wdired.el index a9e1e2a..8ee9a83 100644 --- a/lisp/wdired.el +++ b/lisp/wdired.el @@ -849,7 +849,6 @@ Like original function but it skips read-only words." (provide 'wdired) ;; Local Variables: -;; coding: utf-8 ;; byte-compile-dynamic: t ;; End: diff --git a/lisp/woman.el b/lisp/woman.el index 8fe1bfa..81319fa 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -4627,9 +4627,4 @@ logging the message." (provide 'woman) - -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; woman.el ends here diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index b99db48..8ec5dfc 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -1,4 +1,4 @@ -;;; x-dnd.el --- drag and drop support for X -*- coding: utf-8 -*- +;;; x-dnd.el --- drag and drop support for X ;; Copyright (C) 2004-2015 Free Software Foundation, Inc. diff --git a/test/automated/mule-util.el b/test/automated/mule-util.el index 038881a..24b56c0 100644 --- a/test/automated/mule-util.el +++ b/test/automated/mule-util.el @@ -1,4 +1,4 @@ -;;; mule-util --- tests for international/mule-util.el -*- coding: utf-8; -*- +;;; mule-util --- tests for international/mule-util.el ;; Copyright (C) 2002-2015 Free Software Foundation, Inc. diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index d9b4c3e..44b05e2 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el @@ -5216,7 +5216,6 @@ class SomeClass: (provide 'python-tests) ;; Local Variables: -;; coding: utf-8 ;; indent-tabs-mode: nil ;; End: commit 2d712286ac67c3bb4d8da3a6d62d71eca1726aad Author: Dmitry Gutov Date: Mon Sep 28 22:41:47 2015 +0300 Revert "Don't rely on defaults in decoding UTF-8 encoded Lisp files" This reverts commit db828f62f6f17414fbbc3206dac123dc73dd6055. diff --git a/lisp/replace.el b/lisp/replace.el index d84f3a2..3a908ac 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,4 +1,4 @@ -;;; replace.el --- replace commands for Emacs -*- coding: utf-8 -*- +;;; replace.el --- replace commands for Emacs ;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2015 Free ;; Software Foundation, Inc. diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index fb96c6c..0ff1d72 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -2446,7 +2446,7 @@ of ENTRY-LIST is a list of cons cells (\"MACRONAME\" . LEVEL). See ;;;*** -;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "751df6ee674ea533b755e8cda4ad1cf8") +;;;### (autoloads nil "reftex-cite" "reftex-cite.el" "43a3f05c024aee5b7708420f74266933") ;;; Generated autoloads from reftex-cite.el (autoload 'reftex-default-bibliography "reftex-cite" "\ diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 4c234c9..581e16e 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -4235,8 +4235,4 @@ column is used (fill-column vs. end of previous/next line)." (provide 'rst) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; rst.el ends here diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 839ca8c..d45a1dc 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -2581,8 +2581,5 @@ It should be added buffer-locally to `write-file-functions'." (run-hooks 'whitespace-load-hook) -;; Local Variables: -;; coding: utf-8 -;; End: ;;; whitespace.el ends here commit e809c39a827ff5528ad7f05f456ff3ba7082133b Author: Dmitry Gutov Date: Mon Sep 28 22:03:22 2015 +0300 ; * CONTRIBUTE: Tweak the "Non-ASCII characters in Emacs files" section diff --git a/CONTRIBUTE b/CONTRIBUTE index 098579e..4d5d08a 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -208,10 +208,10 @@ good idea to add a 'coding' cookie to the file to state its encoding. Please use the UTF-8 encoding unless it cannot do the job for some good reason. As of Emacs 24.4, it is no longer necessary to have explicit 'coding' cookies in *.el files if they are encoded in UTF-8, -but other files need them even if encoded in UTF-8. And even for *.el -files, having an explicit encoding specification facilitates correct -display of non-ASCII characters when the file is visited in older -Emacs versions. +but other files need them even if encoded in UTF-8. However, if +an *.el file is intended for use with older Emacs versions (e.g. if +it's also distributed via ELPA), having an explicit encoding +specification is still a good idea. *** Useful files in the admin/ directory commit f6e1f158f0517cd2520eae2c54065adfd42a8925 Author: Nicolas Petton Date: Mon Sep 28 22:18:26 2015 +0200 Add documentation for seq.el * doc/lispref/sequences.texi: Add documentation regarding extending seq.el, as well as missing documentation for seq-elt, seq-length, seq-p, seq-do and seq-map. diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 2dc494a..0a6f4c6 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -72,6 +72,7 @@ string, bool-vector, or char-table, @code{nil} otherwise. @cindex vector length @cindex sequence length @cindex char-table length +@anchor{Definition of length} This function returns the number of elements in @var{sequence}. If @var{sequence} is a dotted list, a @code{wrong-type-argument} error is signaled. Circular lists may cause an infinite loop. For a @@ -113,6 +114,7 @@ since @code{length} only counts the number of characters, but does not account for the display width of each character. @defun elt sequence index +@anchor{Definition of elt} @cindex elements of sequences This function returns the element of @var{sequence} indexed by @var{index}. Legitimate values of @var{index} are integers ranging @@ -431,6 +433,57 @@ you pass as an argument. Unless otherwise stated, the result is a sequence of the same type as the input. For those functions that take a predicate, this should be a function of one argument. + The @file{seq.el} library can be extended to work with additional +types of sequential data-structures. For that purpose, all functions +are defined using @code{cl-defgeneric}. + +@defun seq-elt sequence index + This function the element at the index @var{index} in +@var{sequence}. @var{index} can be an integer from zero up to the +length of @var{sequence} minus one. For out-of-range values on +built-in sequence types, @code{seq-elt} behaves like @code{elt}. +@xref{Definition of elt}. + +@example +@group +(seq-elt [1 2 3 4] 2) +@result{} 3 +@end group + + @code{seq-elt} returns settable places using @code{setf}. + +@group +(setq vec [1 2 3 4]) +(setf (seq-elt vec 2) 5) +vec +@result{} [1 2 5 4] +@end group +@end example +@end defun + +@defun seq-length sequence + This function returns the number of elements in @var{sequence}. For +built-in sequence types, @code{seq-length} behaves like @code{length}. +@xref{Definition of length}. +@end defun + +@defun seq-p sequence + This function returns non-@code{nil} if @var{sequence} is a sequence +(a list or array), or any additional type of sequence defined via +@file{seq.el} generic functions. + +@example +@group +(seq-p [1 2]) +@result{} t +@end group +@group +(seq-p 2) +@result{} nil +@end group +@end example +@end defun + @defun seq-drop sequence n This function returns all but the first @var{n} (an integer) elements of @var{sequence}. If @var{n} is negative or zero, @@ -497,6 +550,28 @@ starting from the first one for which @var{predicate} returns @code{nil}. @end example @end defun +@defun seq-do function sequence + This function applies @var{function} to each element of +@var{sequence} in turn (presumably for side effects) and returns +@var{sequence}. +@end defun + +@defun seq-map function sequence + This function returns the result of applying @var{function} to each +element of @var{sequence}. The returned value is a list. + +@example +@group +(seq-map #'1+ '(2 4 6)) +@result{} (3 5 7) +@end group +@group +(seq-map #'symbol-name [foo bar]) +@result{} ("foo" "bar") +@end group +@end example +@end defun + @defun seq-filter predicate sequence @cindex filtering sequences This function returns a list of all the elements in @var{sequence} commit f0b71429b9fbfb5dc5a561321de42a39fc176809 Author: Nicolas Petton Date: Mon Sep 28 21:11:05 2015 +0200 Better documentation for seq-some * doc/lispref/sequences.texi: * lisp/emacs-lisp/seq.el: Update the documentation of seq-some to guarantee that the returned value is the first non-nil value that resulted from applying the predicate. diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index b85d5d4..2dc494a 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -558,9 +558,8 @@ calling @var{function}. @end defun @defun seq-some predicate sequence - This function returns non-@code{nil} if @var{predicate} returns -non-@code{nil} for any element of @var{sequence}. If so, the returned -value is the value returned by @var{predicate}. + This function returns the first non-@code{nil} value returned by +applying @var{predicate} to each element of @var{sequence} in turn. @example @group @@ -575,6 +574,10 @@ value is the value returned by @var{predicate}. (seq-some #'null ["abc" 1 nil]) @result{} t @end group +@group +(seq-some #'1+ [2 4 6]) +@result{} 3 +@end group @end example @end defun diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index e0f17c0..a63447d 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -261,8 +261,7 @@ If SEQ is empty, return INITIAL-VALUE and FUNCTION is not called." t)) (cl-defgeneric seq-some (pred seq) - "Return non-nil if (PRED element) is non-nil for any element in SEQ, nil otherwise. -If so, return the non-nil value returned by PRED." + "Return the first value for which if (PRED element) is non-nil for in SEQ." (catch 'seq--break (seq-doseq (elt seq) (let ((result (funcall pred elt))) commit 5526561b0c8416cbae492bc246eacd30f7b1daa8 Author: Nicolas Petton Date: Sun Sep 27 17:59:35 2015 +0200 * lisp/arc-mode.el: Sharp-quote function arguments. diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 4df41b5..f852f2d 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -839,7 +839,7 @@ when parsing the archive." ;; long when the archive -- which has to be moved in memory -- is large. (insert (apply - (function concat) + #'concat (mapcar (lambda (fil) ;; Using `concat' here copies the text also, so we can add @@ -1050,7 +1050,7 @@ using `make-temp-file', and the generated name is returned." (setq default-directory arcdir) (make-local-variable 'archive-superior-buffer) (setq archive-superior-buffer archive-buffer) - (add-hook 'write-file-functions 'archive-write-file-member nil t) + (add-hook 'write-file-functions #'archive-write-file-member nil t) (setq archive-subfile-mode descr) (setq archive-file-name-coding-system file-name-coding) (if (and @@ -1091,7 +1091,7 @@ using `make-temp-file', and the generated name is returned." (if read-only-p (setq archive-read-only t)) ;; We will write out the archive ourselves if it is ;; part of another archive. - (remove-hook 'write-contents-functions 'archive-write-file t)) + (remove-hook 'write-contents-functions #'archive-write-file t)) (run-hooks 'archive-extract-hook) (if archive-read-only (message "Note: altering this archive is not implemented.")))) @@ -1111,7 +1111,7 @@ using `make-temp-file', and the generated name is returned." exit-status success) (make-directory (directory-file-name default-directory) t) (setq exit-status - (apply 'call-process + (apply #'call-process (car command) nil nil @@ -1136,7 +1136,7 @@ using `make-temp-file', and the generated name is returned." (let ((stderr-file (make-temp-file "arc-stderr"))) (unwind-protect (prog1 - (apply 'call-process + (apply #'call-process (car command) nil (if stderr-file (list t stderr-file) t) @@ -1157,7 +1157,7 @@ using `make-temp-file', and the generated name is returned." (stdout-file (make-temp-file "arc-stdout"))) (unwind-protect (prog1 - (apply 'call-process + (apply #'call-process (car command) nil `(:file ,stdout-file) @@ -1284,7 +1284,7 @@ using `make-temp-file', and the generated name is returned." (setq ename (encode-coding-string ename archive-file-name-coding-system)) (let* ((coding-system-for-write 'no-conversion) - (exitcode (apply 'call-process + (exitcode (apply #'call-process (car command) nil nil @@ -1444,7 +1444,7 @@ as a relative change like \"g+rw\" as for chmod(2)." (revert-buffer)))))) (defun archive-*-expunge (archive files command) - (apply 'call-process + (apply #'call-process (car command) nil nil @@ -1539,7 +1539,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length files) (if (= 1 (length files)) "" "s")) "\n")) - (apply 'vector (nreverse files)))) + (apply #'vector (nreverse files)))) (defun archive-arc-rename-entry (newname descr) (if (string-match "[:\\\\/]" newname) @@ -1708,7 +1708,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length files) (if (= 1 (length files)) "" "s")) "\n")) - (apply 'vector (nreverse files)))) + (apply #'vector (nreverse files)))) (defconst archive-lzh-alternate-display t) @@ -1905,7 +1905,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length files) (if (= 1 (length files)) "" "s")) "\n")) - (apply 'vector (nreverse files)))) + (apply #'vector (nreverse files)))) (defun archive-zip-extract (archive name) (cond @@ -2022,7 +2022,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length files) (if (= 1 (length files)) "" "s")) "\n")) - (apply 'vector (nreverse files)))) + (apply #'vector (nreverse files)))) (defun archive-zoo-extract (archive name) (archive-extract-by-stdout archive name archive-zoo-extract)) @@ -2083,7 +2083,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length text)))) files)) (insert sep (make-string maxname ?-) "\n") - (apply 'vector files)))) + (apply #'vector files)))) (defun archive-rar-extract (archive name) ;; unrar-free seems to have no way to extract to stdout or even to a file. @@ -2171,7 +2171,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length text)))) files)) (insert sep (make-string maxname ?-) "\n") - (apply 'vector files)))) + (apply #'vector files)))) (defun archive-7z-extract (archive name) ;; 7z doesn't provide a `quiet' option to suppress non-essential @@ -2272,7 +2272,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." (length text)))) files)) (insert sep (make-string maxname ?-) "\n") - (apply 'vector files)))) + (apply #'vector files)))) (defun archive-ar-extract (archive name) (let ((destbuf (current-buffer)) commit 1f279344e4c4fad595d359d6d0aa619dea16c308 Author: Eli Zaretskii Date: Mon Sep 28 18:53:26 2015 +0300 Avoid redisplay error in ediff-regions-wordwise * lisp/vc/ediff-util.el (ediff-clone-buffer-for-region-comparison): Make sure the mark is set before activating it. (Bug#21567) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index e664f9f..7ef4254 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3348,6 +3348,7 @@ Without an argument, it saves customized diff argument, if available (setq wind (ediff-get-visible-buffer-window cloned-buff)) (select-window wind) (delete-other-windows) + (or (mark) (push-mark)) (ediff-activate-mark) (split-window-vertically) (ediff-select-lowest-window) commit 3a0974d939233ea04057ecf153d3b6272f30cd4b Author: Eli Zaretskii Date: Mon Sep 28 16:48:52 2015 +0300 ; Remove unnecessary resetting of inhibit_free_realized_faces diff --git a/src/xdisp.c b/src/xdisp.c index 964f02d..863d891 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -14018,7 +14018,6 @@ redisplay_internal (void) if (interrupt_input && interrupts_deferred) request_sigio (); - inhibit_free_realized_faces = false; unbind_to (count, Qnil); RESUME_POLLING; } @@ -14061,7 +14060,6 @@ static void unwind_redisplay (void) { redisplaying_p = false; - inhibit_free_realized_faces = false; } commit 85cd80bb1685e2bb4e6db3d22d96f19b2e2d3006 Author: Eli Zaretskii Date: Mon Sep 28 16:00:13 2015 +0300 ; Fix last commit diff --git a/src/xdisp.c b/src/xdisp.c index 863d891..964f02d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -14018,6 +14018,7 @@ redisplay_internal (void) if (interrupt_input && interrupts_deferred) request_sigio (); + inhibit_free_realized_faces = false; unbind_to (count, Qnil); RESUME_POLLING; } @@ -14060,6 +14061,7 @@ static void unwind_redisplay (void) { redisplaying_p = false; + inhibit_free_realized_faces = false; } commit a11ae01df93d32f4881908b1e6f07d6b908fe272 Author: Eli Zaretskii Date: Mon Sep 28 15:50:29 2015 +0300 Another attempt to fix crashes due to prematurely freed faces * src/xdisp.c (redisplay_internal): Inhibit freeing of realized faces for as long as we might have desired matrices that reference those faces. (Bug#21428) diff --git a/src/xdisp.c b/src/xdisp.c index 2c38aa9..863d891 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13383,6 +13383,8 @@ redisplay_internal (void) pending = false; forget_escape_and_glyphless_faces (); + inhibit_free_realized_faces = false; + /* If face_change, init_iterator will free all realized faces, which includes the faces referenced from current matrices. So, we can't reuse current matrices in this case. */ @@ -13871,6 +13873,10 @@ redisplay_internal (void) if (sf->fonts_changed) goto retry; + /* Prevent freeing of realized faces, since desired matrices are + pending that reference the faces we computed and cached. */ + inhibit_free_realized_faces = true; + /* Prevent various kinds of signals during display update. stdio is not robust about handling signals, which can cause an apparent I/O error. */ commit 28ddc850479fbe333903c0c64be1f24798243824 Author: Tassilo Horn Date: Mon Sep 28 10:59:21 2015 +0200 Add auctex development list email address diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 5cd0761..c6a7be1 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -108,7 +108,7 @@ Nicolas Petton lisp/emacs-lisp/map.el lisp/emacs-lisp/seq.el -The GNU AUCTeX maintainers +The GNU AUCTeX maintainers (auctex-devel@gnu.org) RefTeX lisp/textmodes/reftex-auc.el lisp/textmodes/reftex-cite.el