commit d4d66f4d5409a5d0ab2c821f66c9c9485d7ea9d0 (HEAD, refs/remotes/origin/master) Author: Jan D Date: Fri May 1 10:22:29 2015 +0200 (ns-get-cut-buffer-internal): Remove this alias. * lisp/term/ns-win.el (ns-get-cut-buffer-internal): Remove this alias. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index ac032cf..a87352e 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -717,8 +717,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;;;; Pasteboard support. -(define-obsolete-function-alias 'ns-get-cut-buffer-internal - 'ns-get-selection-internal "24.1") (define-obsolete-function-alias 'ns-store-cut-buffer-internal 'gui-set-selection "24.1") commit 55496af138745cd6810db0de0f05ae3662230cc9 Author: Glenn Morris Date: Thu Apr 30 21:18:52 2015 -0400 * lisp/emacs-lisp/ert.el (ert--special-operator-p): Update for 2015-02-08 change to indirect-function. diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 4ffd8cd..384fef5 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -269,7 +269,7 @@ DATA is displayed to the user and should state the reason for skipping." (defun ert--special-operator-p (thing) "Return non-nil if THING is a symbol naming a special operator." (and (symbolp thing) - (let ((definition (indirect-function thing t))) + (let ((definition (ignore-errors (indirect-function thing)))) (and (subrp definition) (eql (cdr (subr-arity definition)) 'unevalled))))) commit 31c57b40c89d8b730e80ebb6933b1e1e04edeb5e Author: Glenn Morris Date: Thu Apr 30 20:12:34 2015 -0400 * lisp/term/ns-win.el (ns-get-selection-internal): Remove declaration for function deleted 2014-10-21. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 6f8f29c..ac032cf 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -717,8 +717,6 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") ;;;; Pasteboard support. -(declare-function ns-get-selection-internal "nsselect.m" (buffer)) - (define-obsolete-function-alias 'ns-get-cut-buffer-internal 'ns-get-selection-internal "24.1") (define-obsolete-function-alias 'ns-store-cut-buffer-internal commit 45e199d4a48c65d1057965ebd99a3a0ef40984d6 Author: Glenn Morris Date: Thu Apr 30 20:09:50 2015 -0400 * lisp/dom.el: Load subr-x when compiling, for when-let. diff --git a/lisp/dom.el b/lisp/dom.el index 4213107..091197a 100644 --- a/lisp/dom.el +++ b/lisp/dom.el @@ -25,6 +25,7 @@ ;;; Code: (require 'cl-lib) +(eval-when-compile (require 'subr-x)) (defsubst dom-tag (node) "Return the NODE tag." commit e22f333ddb1af56334146583e3bdbcf85cf189d6 Author: Glenn Morris Date: Thu Apr 30 20:09:02 2015 -0400 Silence some compilation warnings * lisp/emacs-lisp/check-declare.el (compilation-forget-errors): * lisp/emulation/cua-base.el (delete-active-region): * lisp/net/net-utils.el (w32-get-console-output-codepage): * lisp/term/ns-win.el (ns-own-selection-internal) (ns-disown-selection-internal, ns-selection-owner-p) (ns-selection-exists-p, ns-get-selection): Declare for compiler.. diff --git a/lisp/emacs-lisp/check-declare.el b/lisp/emacs-lisp/check-declare.el index 8fc299d..a7045ad8 100644 --- a/lisp/emacs-lisp/check-declare.el +++ b/lisp/emacs-lisp/check-declare.el @@ -284,6 +284,8 @@ TYPE is a string giving the nature of the error. Warning is displayed in type) nil check-declare-warning-buffer))) +(declare-function compilation-forget-errors "compile" ()) + (defun check-declare-files (&rest files) "Check veracity of all `declare-function' statements in FILES. Return a list of any errors found." diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index c6d7b50..e91ce80 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -790,6 +790,8 @@ Repeating prefix key when region is active works as a single prefix key." ;;; Region specific commands +(declare-function delete-active-region "delsel" (&optional killp)) + (defun cua-delete-region () "Delete the active region. Save a copy in register 0 if `cua-delete-copy-to-register-0' is non-nil." diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index ebcbc71..eaf1d7e 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -326,6 +326,8 @@ This variable is only used if the variable (insert filtered-string) (set-marker (process-mark process) (point)))))) +(declare-function w32-get-console-output-codepage "w32proc.c" ()) + (defun net-utils-run-program (name header program args) "Run a network information program." (let ((buf (get-buffer-create (concat "*" name "*"))) diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 9264a1c..6f8f29c 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -930,6 +930,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (gui-method-define window-system-initialization ns #'ns-initialize-window-system) +(declare-function ns-own-selection-internal "nsselect.m" (selection value)) +(declare-function ns-disown-selection-internal "nsselect.m" (selection)) +(declare-function ns-selection-owner-p "nsselect.m" + (&optional selection terminal)) +(declare-function ns-selection-exists-p "nsselect.m" + (&optional selection terminal)) +(declare-function ns-get-selection "nsselect.m" + (selection-symbol target-type &optional time-stamp terminal)) + (gui-method-define gui-set-selection ns (lambda (selection value) (if value (ns-own-selection-internal selection value) commit ce7ff436ffd6d9ace7e8d89f4cc81c427407cfaf Author: Glenn Morris Date: Thu Apr 30 20:06:15 2015 -0400 Function declaration updates prompted by 'make check-declare' * lisp/emacs-lisp/package.el (lm-homepage): * lisp/gnus/gnus-util.el (iswitchb-read-buffer): * lisp/gnus/mm-decode.el (libxml-parse-html-region): * lisp/gnus/mml.el (libxml-parse-html-region): * lisp/gnus/nnrss.el (libxml-parse-html-region): * lisp/net/eww.el (libxml-parse-html-region): * lisp/net/shr.el (libxml-parse-html-region): * lisp/vc/vc-bzr.el (vc-annotate-convert-time): * lisp/vc/vc-cvs.el (vc-annotate-convert-time): * lisp/vc/vc-git.el (vc-annotate-convert-time): * lisp/vc/vc-hg.el (vc-annotate-convert-time): * lisp/vc/vc-mtn.el (vc-annotate-convert-time): * lisp/vc/vc-rcs.el (vc-annotate-convert-time): Update declaration. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index db61aba..c2c0f34 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -956,7 +956,7 @@ is wrapped around any parts requiring it." deps)))) (declare-function lm-header "lisp-mnt" (header)) -(declare-function lm-homepage "lisp-mnt" ()) +(declare-function lm-homepage "lisp-mnt" (&optional file)) (defun package-buffer-info () "Return a `package-desc' describing the package in the current buffer. diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 7bacaba..4b06cc0 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1575,7 +1575,8 @@ SPEC is a predicate specifier that contains stuff like `or', `and', (declare-function iswitchb-read-buffer "iswitchb" - (prompt &optional default require-match start matches-set)) + (prompt &optional default require-match + _predicate start matches-set)) (defvar iswitchb-temp-buflist) (defun gnus-iswitchb-completing-read (prompt collection &optional require-match diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index ae6bb71..bce9abd 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1827,7 +1827,7 @@ If RECURSIVE, search recursively." (not (mm-long-lines-p 76)))))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (declare-function shr-insert-document "shr" (dom)) (defvar shr-blocked-images) (defvar shr-use-fonts) diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el index 2a3b228..5754475 100644 --- a/lisp/gnus/mml.el +++ b/lisp/gnus/mml.el @@ -463,7 +463,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (defvar mml-inhibit-compute-boundary nil) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun mml-generate-mime (&optional multipart-type) "Generate a MIME message based on the current MML document. diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index ac9c5ff..1546f92 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -395,7 +395,7 @@ otherwise return nil." (mm-coding-system-p 'utf-8))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun nnrss-fetch (url &optional local) "Fetch URL and put it in a the expected Lisp structure." (mm-with-unibyte-buffer diff --git a/lisp/net/eww.el b/lisp/net/eww.el index a128ffb..f2f5ecb 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -379,7 +379,7 @@ Currently this means either text/html or application/xhtml+xml." (match-string 1))))) (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun eww-display-html (charset url &optional document point buffer encode) (unless (fboundp 'libxml-parse-html-region) diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 454332e..7763507 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -178,7 +178,7 @@ cid: URL as the argument.") ;; Public functions and commands. (declare-function libxml-parse-html-region "xml.c" - (start end &optional base-url)) + (start end &optional base-url discard-comments)) (defun shr-render-buffer (buffer) "Display the HTML rendering of the current buffer." diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 9c52106..a1f6bab 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -873,7 +873,7 @@ property containing author and date information." (move-marker (process-mark proc) (point)))) (process-put proc :vc-left-over string))))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-bzr-annotate-time () (when (re-search-forward "^ *[0-9.]+ +.+? +|" nil t) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 232dcc2..9a41905 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -651,7 +651,7 @@ Optional arg REVISION is a revision to annotate from." (re-search-forward vc-cvs-annotate-first-line-re) (delete-region (point-min) (1- (point))))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-cvs-annotate-current-time () "Return the current time, based at midnight of the current day, and diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index c8b696a..2bca723 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1035,7 +1035,7 @@ or BRANCH^ (where \"^\" can be repeated)." (append (vc-switches 'git 'annotate) (list rev "--" name))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-git-annotate-time () (and (re-search-forward "[0-9a-f]+[^()]+(.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+) " nil t) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index c841dfc..c302436 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -373,7 +373,7 @@ Optional arg REVISION is a revision to annotate from." (append (vc-switches 'hg 'annotate) (if revision (list (concat "-r" revision)))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) ;; The format for one line output by "hg annotate -d -n" looks like this: ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index cd84ebe..93bd1f6 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -261,7 +261,7 @@ If LIMIT is non-nil, show no more than this many entries." (append (vc-switches 'mtn 'annotate) (if rev (list "-r" rev))))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defconst vc-mtn-annotate-full-re "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ") diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8aedc00..1e19908 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -758,7 +758,7 @@ Optional arg REVISION is a revision to annotate from." (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) (forward-line 1)))) -(declare-function vc-annotate-convert-time "vc-annotate" (time)) +(declare-function vc-annotate-convert-time "vc-annotate" (&optional time)) (defun vc-rcs-annotate-current-time () "Return the current time, based at midnight of the current day, and commit e0d0ad2acce8a153f10ecbb84c51c6e0981e3c0c Author: Glenn Morris Date: Thu Apr 30 20:00:23 2015 -0400 Remove compatibility code for 20-year old function renaming * lisp/progmodes/idlw-shell.el (idlwave-shell-comint-filter): Make it an obsolete alias. (idlwave-shell-filter): Change all uses to comint-output-filter. diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 40c40ee..02a8ec8 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1445,12 +1445,8 @@ Otherwise just move the line. Move down unless UP is non-nil." (interactive "p") (idlwave-shell-move-or-history nil arg)) -;; Newer versions of comint.el changed the name of comint-filter to -;; comint-output-filter. -(defalias 'idlwave-shell-comint-filter - (if (fboundp 'comint-output-filter) - #'comint-output-filter - #'comint-filter)) +(define-obsolete-function-alias 'idlwave-shell-comint-filter + 'comint-output-filter "25.1") (defun idlwave-shell-is-running () "Return t if the shell process is running." @@ -1496,7 +1492,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." (get-buffer-create idlwave-shell-hidden-output-buffer)) (goto-char (point-max)) (insert string)) - (idlwave-shell-comint-filter proc string)) + (comint-output-filter proc string)) ;; Watch for magic - need to accumulate the current line ;; since it may not be sent all at once. (if (string-match "\n" string) @@ -1552,7 +1548,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." (if idlwave-shell-hide-output (if (and idlwave-shell-show-if-error (eq idlwave-shell-current-state 'error)) - (idlwave-shell-comint-filter proc full-output) + (comint-output-filter proc full-output) ;; If it's only *mostly* hidden, filter % lines, ;; and show anything that remains (if (eq idlwave-shell-hide-output 'mostly) @@ -1560,7 +1556,7 @@ and then calls `idlwave-shell-send-command' for any pending commands." (idlwave-shell-filter-hidden-output full-output))) (if filtered - (idlwave-shell-comint-filter + (comint-output-filter proc filtered)))))) ;; Call the post-command hook commit 4d2ffa0eedd9c7ec0b4f94b545368efd4cc51ae1 Author: Tassilo Horn Date: Thu Apr 30 23:00:06 2015 +0200 Add ace-window face config * etc/themes/tsdh-light-theme.el (tsdh-light): Add ace-window face configuration. diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el index 6555e49..397885a 100644 --- a/etc/themes/tsdh-light-theme.el +++ b/etc/themes/tsdh-light-theme.el @@ -26,7 +26,8 @@ Used and created by Tassilo Horn.") (custom-theme-set-faces 'tsdh-light '(Info-quoted ((t (:weight bold)))) - '(ace-jump-face-foreground ((t (:foreground "DeepPink" :box (:line-width -1 :color "grey75") :weight bold)))) + '(ace-jump-face-foreground ((t (:foreground "DeepPink" :box nil :weight bold)))) + '(aw-leading-char-face ((t (:inherit ace-jump-face-foreground)))) '(default ((t (:background "white" :foreground "black")))) '(diff-added ((t (:inherit diff-changed :background "light green")))) '(diff-changed ((t (:background "light steel blue")))) commit d6e990b65cc560e97c02e99bfd00826018b3030c Author: Paul Eggert Date: Thu Apr 30 09:17:57 2015 -0700 Unclutter 'make doc' output a bit * Makefile.in ($(DOCS), $(INSTALL_DOC), $(UNINSTALL_DOC)): Use make subst rather than sh IFS to split target string apart. This makes 'make' output easier to follow. diff --git a/Makefile.in b/Makefile.in index f88a9c5..858a34d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -940,7 +940,7 @@ PSS = lispref-ps lispintro-ps emacs-ps misc-ps DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) $(DOCS): - t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$1 $$2 + $(MAKE) -C doc/$(subst -, ,$@) .PHONY: $(DOCS) docs pdf ps .PHONY: info dvi dist check html info-real info-dir check-info @@ -997,7 +997,7 @@ INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS) ## Install non .info forms of the documentation. ## TODO add etc/refcards. $(INSTALL_DOC): - t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3 + $(MAKE) -C doc/$(subst -, install-,$(subst install-,,$@)) .PHONY: $(INSTALL_DOC) install-doc .PHONY: install-dvi install-html install-pdf install-ps @@ -1020,7 +1020,7 @@ UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \ UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS) $(UNINSTALL_DOC): - t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3 + $(MAKE) -C doc/$(subst -, uninstall-,$(subst uninstall-,,$@)) .PHONY: $(UNINSTALL_DOC) uninstall-doc .PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps commit 4be98d812563ec40fe5186b06fc6da9b3c36ea03 Author: Paul Eggert Date: Thu Apr 30 08:48:53 2015 -0700 Merge from gnulib * doc/misc/texinfo.tex: Update from gnulib. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 8236d7d..dc53be8 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2015-02-05.16} +\def\texinfoversion{2015-04-29.11} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -9836,6 +9836,17 @@ directory should work if nowhere else does.} \def\nonasciistringdefs{% \setnonasciicharscatcode\active \def\defstringchar##1{\def##1{\string##1}}% + % + \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83% + \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87% + \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b% + \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f% + % + \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93% + \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97% + \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b% + \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f% + % \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3% \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7% \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%