mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-14 09:39:42 +00:00
Merge remote-tracking branch 'savannah/master' into HEAD
This commit is contained in:
Andrea Corallo
commit
eb1d22b136
6
etc/NEWS
6
etc/NEWS
@ -104,6 +104,12 @@ shows equivalent key bindings for all commands that have them.
|
||||
*** State changing VC operations are supported in dired-mode on files
|
||||
(but still not on directories).
|
||||
|
||||
** Gnus
|
||||
|
||||
---
|
||||
*** Change to default value of 'message-draft-headers' option.
|
||||
No longer includes the Date header.
|
||||
|
||||
** Help
|
||||
|
||||
+++
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Created: August 2002
|
||||
;; Keywords: calendar
|
||||
;; Human-Keywords: calendar, diary, iCalendar, vCalendar
|
||||
;; Version: 0.19
|
||||
;; Old-Version: 0.19
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -107,6 +107,7 @@
|
||||
|
||||
(defconst icalendar-version "0.19"
|
||||
"Version number of icalendar.el.")
|
||||
(make-obsolete-variable 'icalendar-version nil "28.1")
|
||||
|
||||
;; ======================================================================
|
||||
;; Customizables
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
(defvar dframe-version "1.3"
|
||||
"The current version of the dedicated frame library.")
|
||||
(make-obsolete-variable 'dframe-version nil "28.1")
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
;; Copyright (C) 1997-1998, 2001-2020 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
||||
;; Version: 0.6.2
|
||||
;; Old-Version: 0.6.2
|
||||
;; Keywords: docs, maint, lisp
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
@ -170,6 +170,7 @@
|
||||
;;; Code:
|
||||
(defvar checkdoc-version "0.6.2"
|
||||
"Release version of checkdoc you are currently running.")
|
||||
(make-obsolete-variable 'checkdoc-version nil "28.1")
|
||||
|
||||
(require 'cl-lib)
|
||||
(require 'help-mode) ;; for help-xref-info-regexp
|
||||
@ -2642,7 +2643,7 @@ function called to create the messages."
|
||||
(goto-char (point-max))
|
||||
(let ((inhibit-read-only t))
|
||||
(insert "\n\n\C-l\n*** " label ": "
|
||||
check-type " V " checkdoc-version)))))
|
||||
check-type)))))
|
||||
|
||||
(defun checkdoc-error (point msg)
|
||||
"Store POINT and MSG as errors in the checkdoc diagnostic buffer."
|
||||
|
||||
@ -2845,7 +2845,6 @@ See `edebug-behavior-alist' for implementations.")
|
||||
(if (not (eq edebug-buffer edebug-outside-buffer))
|
||||
(goto-char edebug-outside-point))
|
||||
(if (marker-buffer (edebug-mark-marker))
|
||||
;; Does zmacs-regions need to be nil while doing set-marker?
|
||||
(set-marker (edebug-mark-marker) edebug-outside-mark))
|
||||
)) ; unwind-protect
|
||||
;; None of the following is done if quit or signal occurs.
|
||||
|
||||
@ -3179,15 +3179,12 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
|
||||
(defun package-menu--refresh-contents (&optional _arg _noconfirm)
|
||||
"In Package Menu, download the Emacs Lisp package archive.
|
||||
Fetch the contents of each archive specified in
|
||||
`package-archives', and then refresh the package menu. Signal a
|
||||
user-error if there is already a refresh running asynchronously.
|
||||
`package-archives', and then refresh the package menu.
|
||||
|
||||
`package-menu-mode' sets `revert-buffer-function' to this
|
||||
function. The args ARG and NOCONFIRM, passed from
|
||||
`revert-buffer', are ignored."
|
||||
(package--ensure-package-menu-mode)
|
||||
(when (and package-menu-async package--downloads-in-progress)
|
||||
(user-error "Package refresh is already in progress, please wait..."))
|
||||
(setq package-menu--old-archive-contents package-archive-contents)
|
||||
(setq package-menu--new-package-list nil)
|
||||
(package-refresh-contents package-menu-async))
|
||||
|
||||
@ -178,10 +178,8 @@
|
||||
(defvar edt-user-global-map)
|
||||
(defvar rect-start-point)
|
||||
|
||||
;;;
|
||||
;;; Version Information
|
||||
;;;
|
||||
(defconst edt-version "4.0" "EDT Emulation version number.")
|
||||
(make-obsolete-variable 'edt-version nil "28.1")
|
||||
|
||||
;;;
|
||||
;;; User Configurable Variables
|
||||
|
||||
@ -75,7 +75,11 @@ DELAY is a string, giving the length of the time. Possible values are:
|
||||
variable `gnus-delay-default-hour', minute and second are zero.
|
||||
|
||||
* hh:mm for a specific time. Use 24h format. If it is later than this
|
||||
time, then the deadline is tomorrow, else today."
|
||||
time, then the deadline is tomorrow, else today.
|
||||
|
||||
The value of `message-draft-headers' determines which headers are
|
||||
generated when the article is delayed. Remaining headers are
|
||||
generated when the article is sent."
|
||||
(interactive
|
||||
(list (read-string
|
||||
"Target date (YYYY-MM-DD), time (hh:mm), or length of delay (units in [mhdwMY]): "
|
||||
|
||||
@ -215,9 +215,9 @@ Also see `message-required-news-headers' and
|
||||
:link '(custom-manual "(message)Message Headers")
|
||||
:type '(repeat sexp))
|
||||
|
||||
(defcustom message-draft-headers '(References From Date)
|
||||
(defcustom message-draft-headers '(References From)
|
||||
"Headers to be generated when saving a draft message."
|
||||
:version "22.1"
|
||||
:version "28.1"
|
||||
:group 'message-news
|
||||
:group 'message-headers
|
||||
:link '(custom-manual "(message)Message Headers")
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: Anders Holst <aho@sans.kth.se>
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
;; Version: 1.6
|
||||
;; Old-Version: 1.6
|
||||
;; Keywords: abbrev convenience
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -30,12 +30,13 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
;; FIXME? Are these still relevant? Nothing uses them AFAICS.
|
||||
(defconst mule-version "6.0 (HANACHIRUSATO)" "\
|
||||
Version number and name of this version of MULE (multilingual environment).")
|
||||
(make-obsolete-variable 'mule-version nil "28.1")
|
||||
|
||||
(defconst mule-version-date "2003.9.1" "\
|
||||
Distribution date of this version of MULE (multilingual environment).")
|
||||
(make-obsolete-variable 'mule-version-date nil "28.1")
|
||||
|
||||
|
||||
;;; CHARSET
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: Markus Triska <markus.triska@gmx.at>
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
;; Keywords: convenience
|
||||
;; Version: 0.9x
|
||||
;; Old-Version: 0.9x
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
;;; Code:
|
||||
|
||||
(defconst linum-version "0.9x")
|
||||
(make-obsolete-variable 'linum-version nil "28.1")
|
||||
|
||||
(defvar linum-overlays nil "Overlays used in this buffer.")
|
||||
(defvar linum-available nil "Overlays available for reuse.")
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
;; Copyright (C) 1999-2020 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Alex Schroeder <alex@gnu.org>
|
||||
;; Version: 1.0.2
|
||||
;; Old-Version: 1.0.2
|
||||
;; Keywords: comm
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -3306,7 +3306,8 @@ STDERR can also be a file name."
|
||||
|
||||
;; If `append' is non-nil, we copy the file locally, and let
|
||||
;; the native `write-region' implementation do the job.
|
||||
(when append (copy-file filename tmpfile 'ok))
|
||||
(when (and append (file-exists-p filename))
|
||||
(copy-file filename tmpfile 'ok))
|
||||
|
||||
;; We say `no-message' here because we don't want the
|
||||
;; visited file modtime data to be clobbered from the temp
|
||||
|
||||
@ -80,6 +80,7 @@
|
||||
;;; Code:
|
||||
|
||||
(defconst bubbles-version "0.5" "Version number of bubbles.el.")
|
||||
(make-obsolete-variable 'bubbles-version nil "28.1")
|
||||
|
||||
(require 'gamegrid)
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: Anders Lindgren
|
||||
;; Keywords: c, languages, faces
|
||||
;; Version: 1.3.1
|
||||
;; Old-Version: 1.3.1
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: Will Mengarini <seldon@eskimo.com>
|
||||
;; Created: Mo 02 Mar 98
|
||||
;; Version: 0.51
|
||||
;; Old-Version: 0.51
|
||||
;; Keywords: convenience, vi, repeat
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Author: David Ponce <david@dponce.com>
|
||||
;; Created: 24 Mar 2001
|
||||
;; Version: 1.6
|
||||
;; Old-Version: 1.6
|
||||
;; Keywords: convenience
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
(defvar speedbar-version "1.0"
|
||||
"The current version of speedbar.")
|
||||
(make-obsolete-variable 'speedbar-version nil "28.1")
|
||||
(defvar speedbar-incompatible-version "0.14beta4"
|
||||
"This version of speedbar is incompatible with this version.
|
||||
Due to massive API changes (removing the use of the word PATH)
|
||||
@ -1078,7 +1079,7 @@ in the selected file.
|
||||
(setq font-lock-keywords nil) ;; no font-locking please
|
||||
(setq truncate-lines t)
|
||||
(make-local-variable 'frame-title-format)
|
||||
(setq frame-title-format (concat "Speedbar " speedbar-version)
|
||||
(setq frame-title-format "Speedbar"
|
||||
case-fold-search nil
|
||||
buffer-read-only t)
|
||||
(speedbar-set-mode-line-format)
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
;; Author: John Wiegley <johnw@gnu.org>
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
;; Created: 29 Mar 1999
|
||||
;; Version: 2.0
|
||||
;; Old-Version: 2.0
|
||||
;; Keywords: data memory todo pim
|
||||
;; URL: http://gna.org/projects/remember-el/
|
||||
|
||||
@ -181,6 +181,7 @@
|
||||
|
||||
(defconst remember-version "2.0"
|
||||
"This version of remember.")
|
||||
(make-obsolete-variable 'remember-version nil "28.1")
|
||||
|
||||
(defgroup remember nil
|
||||
"A mode to remember information."
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
" <title>Supported Protocols</title>\n"
|
||||
" </head>\n"
|
||||
" <body>\n"
|
||||
" <h1>Supported Protocols - URL v" url-version "</h1>\n"
|
||||
" <h1>Supported Protocols - URL package in Emacs " emacs-version "</h1>\n"
|
||||
" <table width='100%' border='1'>\n"
|
||||
" <tr>\n"
|
||||
" <td>Protocol\n"
|
||||
|
||||
@ -225,7 +225,7 @@ request.")
|
||||
(os-info (unless (and (listp url-privacy-level)
|
||||
(memq 'os url-privacy-level))
|
||||
(format "(%s; %s)" url-system-type url-os-type)))
|
||||
(url-info (format "URL/%s" url-version)))
|
||||
(url-info (format "URL/Emacs")))
|
||||
(string-join (delq nil (list package-info url-info
|
||||
emacs-info os-info))
|
||||
" ")))
|
||||
|
||||
@ -75,7 +75,7 @@
|
||||
" </div>\n"
|
||||
" </body>\n"
|
||||
"</html>\n"
|
||||
"<!-- Automatically generated by URL v" url-version " -->\n"
|
||||
"<!-- Automatically generated by URL in Emacs " emacs-version " -->\n"
|
||||
)))
|
||||
buf))
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
|
||||
(defconst url-version "Emacs"
|
||||
"Version number of URL package.")
|
||||
(make-obsolete-variable 'url-version nil "28.1")
|
||||
|
||||
(defgroup url nil
|
||||
"Uniform Resource Locator tool."
|
||||
|
||||
@ -1257,22 +1257,8 @@ Instead, C-h would jump to previous difference."
|
||||
:type 'boolean
|
||||
:group 'ediff)
|
||||
|
||||
;; This is the same as temporary-file-directory from Emacs 20.3.
|
||||
;; Copied over here because XEmacs doesn't have this variable.
|
||||
(defcustom ediff-temp-file-prefix
|
||||
(file-name-as-directory
|
||||
(cond ((boundp 'temporary-file-directory) temporary-file-directory)
|
||||
((fboundp 'temp-directory) (temp-directory))
|
||||
(t "/tmp/")))
|
||||
;;; (file-name-as-directory
|
||||
;;; (cond ((memq system-type '(ms-dos windows-nt))
|
||||
;;; (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
|
||||
;;; (t
|
||||
;;; (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
|
||||
"Prefix to put on Ediff temporary file names.
|
||||
Do not start with `~/' or `~USERNAME/'."
|
||||
:type 'string
|
||||
:group 'ediff)
|
||||
(define-obsolete-variable-alias 'ediff-temp-file-prefix
|
||||
'temporary-file-directory "28.1")
|
||||
|
||||
(defcustom ediff-temp-file-mode 384 ; u=rw only
|
||||
"Mode for Ediff temporary files."
|
||||
@ -1287,8 +1273,8 @@ This default should work without changes."
|
||||
:type 'regexp
|
||||
:group 'ediff)
|
||||
|
||||
;; needed to simulate frame-char-width in XEmacs.
|
||||
(defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H")))
|
||||
(defvar ediff-H-glyph nil)
|
||||
(make-obsolete-variable 'ediff-H-glyph nil "28.1")
|
||||
|
||||
|
||||
;; Temporary file used for refining difference regions in buffer A.
|
||||
|
||||
@ -131,7 +131,6 @@ to invocation.")
|
||||
(define-key ediff-mode-map [delete] 'ediff-previous-difference)
|
||||
(define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer
|
||||
'ediff-previous-difference nil))
|
||||
;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs
|
||||
(define-key ediff-mode-map [backspace] 'ediff-previous-difference)
|
||||
(define-key ediff-mode-map [?\S-\ ] 'ediff-previous-difference)
|
||||
(define-key ediff-mode-map "n" 'ediff-next-difference)
|
||||
@ -3144,8 +3143,8 @@ Hit \\[ediff-recenter] to reset the windows afterward."
|
||||
(> (length p) 2))
|
||||
(setq short-p (substring p 0 2)))
|
||||
|
||||
(setq f (concat ediff-temp-file-prefix p)
|
||||
short-f (concat ediff-temp-file-prefix short-p)
|
||||
(setq f (concat temporary-file-directory p)
|
||||
short-f (concat temporary-file-directory short-p)
|
||||
f (cond (given-file)
|
||||
((find-file-name-handler f 'insert-file-contents)
|
||||
;; to thwart file name handlers in write-region,
|
||||
@ -3449,7 +3448,6 @@ Without an argument, it saves customized diff argument, if available
|
||||
(declare-function ediff-regions-internal "ediff"
|
||||
(buffer-a beg-a end-a buffer-b beg-b end-b
|
||||
startup-hooks job-name word-mode setup-parameters))
|
||||
(defvar zmacs-regions) ;;XEmacs'ism.
|
||||
|
||||
(defun ediff-inferior-compare-regions ()
|
||||
"Compare regions in an active Ediff session.
|
||||
@ -3461,7 +3459,6 @@ Ediff Control Panel to restore highlighting."
|
||||
(interactive)
|
||||
(let ((answer "")
|
||||
(possibilities (list ?A ?B ?C))
|
||||
(zmacs-regions t)
|
||||
use-current-diff-p
|
||||
begA begB endA endB bufA bufB)
|
||||
|
||||
|
||||
@ -156,12 +156,10 @@ In this case, Ediff will use those frames to display these buffers."
|
||||
'(name . "Ediff")
|
||||
;;'(unsplittable . t)
|
||||
'(minibuffer . nil)
|
||||
'(user-position . t) ; Emacs only
|
||||
'(vertical-scroll-bars . nil) ; Emacs only
|
||||
'(scrollbar-width . 0) ; XEmacs only
|
||||
'(scrollbar-height . 0) ; XEmacs only
|
||||
'(menu-bar-lines . 0) ; Emacs only
|
||||
'(tool-bar-lines . 0) ; Emacs 21+ only
|
||||
'(user-position . t)
|
||||
'(vertical-scroll-bars . nil)
|
||||
'(menu-bar-lines . 0)
|
||||
'(tool-bar-lines . 0)
|
||||
'(left-fringe . 0)
|
||||
'(right-fringe . 0)
|
||||
;; don't lower but auto-raise
|
||||
@ -260,10 +258,9 @@ the frame used for the wide display.")
|
||||
This has effect only on a windowing system.
|
||||
If t, hitting `?' to toggle control panel off iconifies it.
|
||||
|
||||
This is only useful in Emacs and only for certain kinds of window managers,
|
||||
such as TWM and its derivatives, since the window manager must permit
|
||||
keyboard input to go into icons. XEmacs completely ignores keyboard input
|
||||
into icons, regardless of the window manager."
|
||||
This is only useful for certain kinds of window managers, such as
|
||||
TWM and its derivatives, since the window manager must permit
|
||||
keyboard input to go into icons."
|
||||
:type 'boolean)
|
||||
|
||||
;;; Functions
|
||||
@ -952,8 +949,7 @@ create a new splittable frame if none is found."
|
||||
;; just a precaution--we should be in ctl-buffer already
|
||||
(with-current-buffer ctl-buffer
|
||||
(make-local-variable 'frame-title-format)
|
||||
(make-local-variable 'frame-icon-title-format) ; XEmacs
|
||||
(make-local-variable 'icon-title-format)) ; Emacs
|
||||
(make-local-variable 'icon-title-format))
|
||||
|
||||
(ediff-setup-control-buffer ctl-buffer)
|
||||
(setq dont-iconify-ctl-frame
|
||||
@ -1098,6 +1094,7 @@ create a new splittable frame if none is found."
|
||||
)))
|
||||
|
||||
(defun ediff-xemacs-select-frame-hook ()
|
||||
(declare (obsolete nil "28.1"))
|
||||
(if (and (equal (selected-frame) ediff-control-frame)
|
||||
(not ediff-use-long-help-message))
|
||||
(raise-frame ediff-control-frame)))
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
;; Filename: wdired.el
|
||||
;; Author: Juan León Lahoz García <juanleon1@gmail.com>
|
||||
;; Version: 2.0
|
||||
;; Old-Version: 2.0
|
||||
;; Keywords: dired, environment, files, renaming
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
;; Maintainer: emacs-devel@gnu.org
|
||||
;; Keywords: help, unix
|
||||
;; Adapted-By: Eli Zaretskii <eliz@gnu.org>
|
||||
;; Version: 0.551
|
||||
;; Old-Version: 0.551
|
||||
;; URL: http://centaur.maths.qmul.ac.uk/Emacs/WoMan/
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
@ -401,6 +401,7 @@
|
||||
;;; Code:
|
||||
|
||||
(defvar woman-version "0.551 (beta)" "WoMan version information.")
|
||||
(make-obsolete-variable 'woman-version nil "28.1")
|
||||
|
||||
(require 'man)
|
||||
(require 'button)
|
||||
@ -1830,7 +1831,6 @@ Argument EVENT is the invoking mouse event."
|
||||
["Mini Help" woman-mini-help t]
|
||||
,@(if (fboundp 'customize-group)
|
||||
'(["Customize..." (customize-group 'woman) t]))
|
||||
["Show Version" (message "WoMan %s" woman-version) t]
|
||||
"--"
|
||||
("Advanced"
|
||||
["View Source" (view-file woman-last-file-name) woman-last-file-name]
|
||||
@ -1878,7 +1878,6 @@ Argument EVENT is the invoking mouse event."
|
||||
WoMan is an ELisp emulation of much of the functionality of the Emacs
|
||||
`man' command running the standard UN*X man and ?roff programs.
|
||||
WoMan author: F.J.Wright@Maths.QMW.ac.uk
|
||||
WoMan version: see `woman-version'.
|
||||
See `Man-mode' for additional details.
|
||||
\\{woman-mode-map}"
|
||||
(let ((Man-build-page-list (symbol-function 'Man-build-page-list))
|
||||
|
||||
@ -2356,7 +2356,14 @@ This checks also `file-name-as-directory', `file-name-directory',
|
||||
(write-region nil nil tmp-name 3))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents tmp-name)
|
||||
(should (string-equal (buffer-string) "foobaz"))))
|
||||
(should (string-equal (buffer-string) "foobaz")))
|
||||
(delete-file tmp-name)
|
||||
(with-temp-buffer
|
||||
(insert "foo")
|
||||
(write-region nil nil tmp-name 'append))
|
||||
(with-temp-buffer
|
||||
(insert-file-contents tmp-name)
|
||||
(should (string-equal (buffer-string) "foo"))))
|
||||
|
||||
;; Write string.
|
||||
(write-region "foo" nil tmp-name)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user