commit 952d0f2ce4c262f45d19acffb107c7167cd5e07f (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sat Jan 7 18:15:17 2017 -0800 Remove @SET_MAKE@ from manually-maintained files Emacs now assumes GNU Make, so @SET_MAKE@ is no longer needed. * Makefile.in, lwlib/Makefile.in, nextstep/Makefile.in: * src/Makefile.in: Remove @SET_MAKE@. diff --git a/Makefile.in b/Makefile.in index 0ecb273fb2..2e205d88c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,9 +68,6 @@ SHELL = @SHELL@ # current directory. CDPATH= -# If Make doesn't predefine MAKE, set it here. -@SET_MAKE@ - # ==================== Things 'configure' Might Edit ==================== cache_file = @cache_file@ diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index efb7f3a7ab..d6a8f50ce7 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -26,7 +26,6 @@ srcdir=@srcdir@ # MinGW CPPFLAGS may use this. abs_top_srcdir=@abs_top_srcdir@ VPATH=@srcdir@ -@SET_MAKE@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 2d8f85b74a..ad1abb0bf5 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -30,7 +30,6 @@ EXEEXT = @EXEEXT@ # abs_top_srcdir may contain ".." top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P) -@SET_MAKE@ MKDIR_P = @MKDIR_P@ ## Emacs.app. diff --git a/src/Makefile.in b/src/Makefile.in index dbe6b6aa00..ab31983724 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -38,9 +38,6 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ EXEEXT = @EXEEXT@ version = @version@ -# Substitute an assignment for the MAKE variable, because -# BSD doesn't have it as a default. -@SET_MAKE@ MKDIR_P = @MKDIR_P@ # Don't use LIBS. configure puts stuff in it that either shouldn't be # linked with Emacs or is duplicated by the other stuff below. commit 77f35363fd9bb743716a196a3168fa94d896c28e Author: Michael Albinus Date: Sat Jan 7 18:51:30 2017 +0100 Fix a problem with `start-file-process' in Tramp * lisp/net/tramp-sh.el (tramp-maybe-open-connection): `start-file-process' shall work when `non-essential' is non-nil, but there is already an established connection. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index fec9f10d70..71a388767d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4655,7 +4655,11 @@ connection if a previous connection has died for some reason." ;; If `non-essential' is non-nil, don't reopen a new connection. ;; This variable has been introduced with Emacs 24.1. - (when (and (boundp 'non-essential) (symbol-value 'non-essential)) + ;; We check this for the process related to + ;; `tramp-buffer-name'; otherwise `start-file-process' + ;; wouldn't run ever when `non-essential' is non-nil. + (when (and (boundp 'non-essential) (symbol-value 'non-essential) + (null (get-process (tramp-buffer-name vec)))) (throw 'non-essential 'non-essential)) (with-tramp-progress-reporter commit 75cdf429179c6459c10f15578fb32236a8821e4b Author: Rolf Ade Date: Mon Jan 2 20:05:37 2017 -0500 Fix selecting SQLite database files with sql-mode (Bug#23566) * lisp/progmodes/sql.el (sql-sqlite-login-params): Allow any name as SQLite database file name, by default. (sql-get-login-ext): Fixed read-file-name arguments to provide path completion even if a database name pattern is customized and to allow creation of new SQLite database files. Copyright-paperwork-exempt: yes diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index d6c9516c43..71563486ec 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -933,10 +933,10 @@ Starts `sql-interactive-mode' after doing some setup." :version "20.8" :group 'SQL) -(defcustom sql-sqlite-login-params '((database :file ".*\\.\\(db\\|sqlite[23]?\\)")) +(defcustom sql-sqlite-login-params '((database :file nil)) "List of login parameters needed to connect to SQLite." :type 'sql-login-params - :version "24.1" + :version "26.1" :group 'SQL) ;; Customization for MySQL @@ -2954,13 +2954,15 @@ value. (The property value is used as the PREDICATE argument to ((plist-member plist :file) (expand-file-name (read-file-name prompt - (file-name-directory last-value) default t + (file-name-directory last-value) default 'confirm (file-name-nondirectory last-value) (when (plist-get plist :file) `(lambda (f) - (string-match - (concat "\\<" ,(plist-get plist :file) "\\>") - (file-name-nondirectory f))))))) + (if (not (file-regular-p f)) + t + (string-match + (concat "\\<" ,(plist-get plist :file) "\\>") + (file-name-nondirectory f)))))))) ((plist-member plist :completion) (completing-read prompt-def (plist-get plist :completion) nil t commit e272032769178768cf970839a9c22aba1f5b572e Author: Eli Zaretskii Date: Sat Jan 7 14:33:41 2017 +0200 Specify encoding of the bookmark file * lisp/bookmark.el (bookmark-insert-file-format-version-stamp): Accept an argument CODING and include a 'coding:' cookie in the bookmark file preamble. (bookmark-upgrade-file-format-from-0): Call 'bookmark-insert-file-format-version-stamp' with the file buffer's encoding, as detected when it was read. (bookmark-file-coding-system): New variable. (bookmark-load): Set bookmark-file-coding-system to the encoding of the loaded file. (bookmark-write-file): Bind coding-system-for-write to either the user setting via "C-x RET c" or to the existing file encoding, defaulting to 'utf-8-emacs'. Update the value of bookmark-file-coding-system. (Bug#25365) diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 3440a52ad4..e18362bca9 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -267,6 +267,8 @@ or the deprecated form (BOOKMARK-NAME PARAM-ALIST). (defvar bookmarks-already-loaded nil "Non-nil if and only if bookmarks have been loaded from `bookmark-default-file'.") +(defvar bookmark-file-coding-system nil + "The coding-system of the last loaded or saved bookmark file.") ;; more stuff added by db. @@ -689,7 +691,7 @@ This expects to be called from `point-min' in a bookmark file." (let* ((old-list (bookmark-alist-from-buffer)) (new-list (bookmark-upgrade-version-0-alist old-list))) (delete-region (point-min) (point-max)) - (bookmark-insert-file-format-version-stamp) + (bookmark-insert-file-format-version-stamp buffer-file-coding-system) (pp new-list (current-buffer)) (save-buffer)) (goto-char (point-min)) @@ -726,11 +728,14 @@ This expects to be called from `point-min' in a bookmark file." (error "Bookmark file format version strangeness"))))) -(defun bookmark-insert-file-format-version-stamp () - "Insert text indicating current version of bookmark file format." +(defun bookmark-insert-file-format-version-stamp (coding) + "Insert text indicating current version of bookmark file format. +CODING is the symbol of the coding-system in which the file is encoded." + (if (memq (coding-system-base coding) '(undecided prefer-utf-8)) + (setq coding 'utf-8-emacs)) (insert - (format ";;;; Emacs Bookmark Format Version %d ;;;;\n" - bookmark-file-format-version)) + (format ";;;; Emacs Bookmark Format Version %d ;;;; -*- coding: %S -*- \n" + bookmark-file-format-version (coding-system-base coding))) (insert ";;; This format is meant to be slightly human-readable;\n" ";;; nevertheless, you probably don't want to edit it.\n" ";;; " @@ -1417,14 +1422,17 @@ for a file, defaulting to the file defined by variable (with-current-buffer (get-buffer-create " *Bookmarks*") (goto-char (point-min)) (delete-region (point-min) (point-max)) - (let ((print-length nil) + (let ((coding-system-for-write + (or coding-system-for-write + bookmark-file-coding-system 'utf-8-emacs)) + (print-length nil) (print-level nil) ;; See bug #12503 for why we bind `print-circle'. Users ;; can define their own bookmark types, which can result in ;; arbitrary Lisp objects being stored in bookmark records, ;; and some users create objects containing circularities. (print-circle t)) - (bookmark-insert-file-format-version-stamp) + (bookmark-insert-file-format-version-stamp coding-system-for-write) (insert "(") ;; Rather than a single call to `pp' we make one per bookmark. ;; Apparently `pp' has a poor algorithmic complexity, so this @@ -1440,6 +1448,7 @@ for a file, defaulting to the file defined by variable (condition-case nil (write-region (point-min) (point-max) file) (file-error (message "Can't write %s" file))) + (setq bookmark-file-coding-system coding-system-for-write) (kill-buffer (current-buffer)) (bookmark-maybe-message "Saving bookmarks to file %s...done" file))))) @@ -1521,7 +1530,8 @@ unique numeric suffixes \"<2>\", \"<3>\", etc." (expand-file-name bookmark-default-file)) file) (setq bookmarks-already-loaded t)) - (bookmark-bmenu-surreptitiously-rebuild-list)) + (bookmark-bmenu-surreptitiously-rebuild-list) + (setq bookmark-file-coding-system buffer-file-coding-system)) (error "Invalid bookmark list in %s" file))) (kill-buffer (current-buffer))) (if (null no-msg) commit 50fd04cd4b831a166db30292c4dc0c24be8e6e9d Author: Eli Zaretskii Date: Sat Jan 7 13:02:50 2017 +0200 Avoid infloop in 'ispell-region' * lisp/textmodes/ispell.el (ispell-begin-skip-region-regexp): Protect against 'ispell-skip-region-alist' being nil. Reported by Ernest Adrogué , see http://lists.gnu.org/archive/html/help-gnu-emacs/2017-01/msg00007.html. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 27ee5d372f..9747bd6cc1 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3133,7 +3133,14 @@ Must be called after `ispell-buffer-local-parsing' due to dependence on mode." (if (string= "" comment-end) "^" (regexp-quote comment-end))) (if (and (null ispell-check-comments) comment-start) (regexp-quote comment-start)) - (ispell-begin-skip-region ispell-skip-region-alist) + ;; If they set ispell-skip-region-alist to nil, mapconcat + ;; will produce an empty string, which will then match + ;; anything without moving point, something + ;; ispell-skip-region doesn't expect. Perhaps we should be + ;; more defensive and delq "" above as well, in addition to + ;; deleting nil elements. + (if ispell-skip-region-alist + (ispell-begin-skip-region ispell-skip-region-alist)) (ispell--make-filename-or-URL-re))) "\\|"))