mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 01:20:37 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/pgtk

Browse source
This commit is contained in:
Po Lu 2021-12-10 14:50:21 +08:00
commit cc0f147180
25 changed files with 68 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog.17
View file

@ -10766,7 +10766,7 @@
* emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value.
(find-gc-source-files): Update some names.
(trace-call-tree): Simplify and update.
Avoid predictable temp-file names. (http://bugs.debian.org/747100)
Avoid predictable temp-file names. (https://bugs.debian.org/747100)
This is CVE-2014-3422.
2014-05-08 Stefan Monnier <monnier@iro.umontreal.ca>
@ -17742,7 +17742,7 @@
2013-10-13 Glenn Morris <rgm@gnu.org>
* progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent):
Occur buffers are read-only. http://bugs.debian.org/720775
Occur buffers are read-only. https://bugs.debian.org/720775
* emacs-lisp/authors.el (authors-fixed-entries):
Comment out old alpha stuff.

2
lisp/Makefile.in
View file

@ -60,7 +60,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
# The example above is just for developers, it should not be used by default.
# Those automatically generated autoload files that need special rules
# to build; ie not including things created via generated-autoload-file
# to build; i.e. not including things created via generated-autoload-file
# (eg calc/calc-loaddefs.el).
LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
$(lisp)/calendar/diary-loaddefs.el \

2
lisp/gnus/ChangeLog.2
View file

@ -1759,7 +1759,7 @@
* pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el, pgg.el: Reapply changes
from 2003-04-03 to fix security problem.
See http://www.debian.org/security/2003/dsa-339.
See https://www.debian.org/security/2003/dsa-339.
2003-07-23 Teodor Zlatanov <tzz@lifelogs.com>

2
lisp/gnus/ChangeLog.3
View file

@ -655,7 +655,7 @@
2014-05-08 Glenn Morris <rgm@gnu.org>
* gnus-fun.el (gnus-grab-cam-face):
Do not use predictable temp-file name. (http://bugs.debian.org/747100)
Do not use predictable temp-file name. (https://bugs.debian.org/747100)
This is CVE-2014-3421.
2014-05-04 Glenn Morris <rgm@gnu.org>

5
lisp/htmlfontify.el
View file

@ -77,6 +77,7 @@
;; Changes: moved to changelog (CHANGES) file.
;;; Code:
(eval-when-compile (require 'cl-lib))
(require 'cus-edit)
@ -2307,10 +2308,6 @@ See also `hfy-load-tags-cache'."
(interactive "D source directory: ")
(hfy-load-tags-cache (directory-file-name srcdir)))
;;(defun hfy-test-read-args (foo bar)
;; (interactive "D source directory: \nD target directory: ")
;; (message "foo: %S\nbar: %S" foo bar))
(defun hfy-save-kill-buffers (buffer-list &optional dstdir)
(dolist (B buffer-list)
(set-buffer B)

2
lisp/image-dired.el
View file

@ -41,7 +41,7 @@
;;
;; I briefly tried out thumbs.el, and although it seemed more
;; powerful than this package, it did not work the way I wanted to. It
;; was too slow to created thumbnails of all files in a directory (I
;; was too slow to create thumbnails of all files in a directory (I
;; currently keep all my 2000+ images in the same directory) and
;; browsing the thumbnail buffer was slow too. image-dired.el will not
;; create thumbnails until they are needed and the browsing is done

2
lisp/mh-e/ChangeLog.1
View file

@ -10218,7 +10218,7 @@
it can fail if the user's MH environment is not setup correctly).
I now set the value of mh-folder-unseen-seq-name at runtime when I
first need it. This should fix Debian bugs
http://bugs.debian.org/140232 and http://bugs.debian.org/140817
https://bugs.debian.org/140232 and https://bugs.debian.org/140817
2002-03-25 Peter S Galbraith <psg@debian.org>

2
lisp/net/newst-backend.el
View file

@ -4,7 +4,7 @@
;; Author: Ulf Jasper <ulf.jasper@web.de>
;; Filename: newst-backend.el
;; URL: http://www.nongnu.org/newsticker
;; URL: https://www.nongnu.org/newsticker
;; Keywords: News, RSS, Atom
;; Package: newsticker

2
lisp/net/newst-reader.el
View file

@ -4,7 +4,7 @@
;; Author: Ulf Jasper <ulf.jasper@web.de>
;; Filename: newst-reader.el
;; URL: http://www.nongnu.org/newsticker
;; URL: https://www.nongnu.org/newsticker
;; Package: newsticker
;; ======================================================================

2
lisp/net/newst-ticker.el
View file

@ -4,7 +4,7 @@
;; Author: Ulf Jasper <ulf.jasper@web.de>
;; Filename: newst-ticker.el
;; URL: http://www.nongnu.org/newsticker
;; URL: https://www.nongnu.org/newsticker
;; Keywords: News, RSS, Atom
;; Package: newsticker

2
lisp/net/newsticker.el
View file

@ -4,7 +4,7 @@
;; Author: Ulf Jasper <ulf.jasper@web.de>
;; Filename: newsticker.el
;; URL: http://www.nongnu.org/newsticker
;; URL: https://www.nongnu.org/newsticker
;; Created: 17. June 2003
;; Keywords: News, RSS, Atom

2
lisp/net/quickurl.el
View file

@ -55,7 +55,7 @@
;;
;; (("GNU" . "https://www.gnu.org/")
;; ("FSF" "https://www.fsf.org/" "The Free Software Foundation")
;; ("emacs" . "http://www.emacs.org/")
;; ("emacs" . "https://www.emacs.org/")
;; ("davep" "http://www.davep.org/" "Dave's homepage"))
;;
;; In case you're wondering about the mixture of cons cells and lists,

2
lisp/net/tramp-archive.el
View file

@ -104,7 +104,7 @@
;; It is even possible to access file archives in file archives, as
;; (find-file
;; "http://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")
;; "https://ftp.debian.org/debian/pool/main/c/coreutils/coreutils_8.28-1_amd64.deb/control.tar.gz/control")
;;; Code:

4
lisp/org/org.el
View file

@ -693,7 +693,7 @@ defined in org-duration.el.")
If a description starts with <C>, the file is not part of Emacs and Org mode,
so loading it will require that you have properly installed org-contrib
package from NonGNU Emacs Lisp Package Archive
http://elpa.nongnu.org/nongnu/org-contrib.html
https://elpa.nongnu.org/nongnu/org-contrib.html
You can also use this system to load external packages (i.e. neither Org
core modules, nor org-contrib modules). Just add symbols
@ -773,7 +773,7 @@ For export specific modules, see also `org-export-backends'."
If a description starts with <C>, the file is not part of Emacs and Org mode,
so loading it will require that you have properly installed org-contrib
package from NonGNU Emacs Lisp Package Archive
http://elpa.nongnu.org/nongnu/org-contrib.html
https://elpa.nongnu.org/nongnu/org-contrib.html
Unlike to `org-modules', libraries in this list will not be
loaded along with Org, but only once the export framework is

85
lisp/pixel-scroll.el
View file

@ -397,7 +397,11 @@ returns nil."
The returned value is a cons of the position of the first
character on the unseen line just above the scope of current
window, and the pixel height of that line."
(let* ((pos0 (window-start))
(let* ((pos0 (save-excursion
(goto-char (window-start))
(unless (bobp)
(beginning-of-visual-line))
(point)))
(vscroll0 (window-vscroll nil t))
(line-height nil)
(pos
@ -407,8 +411,7 @@ window, and the pixel height of that line."
(point-min)
(vertical-motion -1)
(setq line-height
(cdr (window-text-pixel-size nil (point)
pos0)))
(cdr (window-text-pixel-size nil (point) pos0)))
(point)))))
;; restore initial position
(set-window-start nil pos0 t)
@ -436,12 +439,13 @@ the height of the current window."
(let* ((desired-pos (posn-at-x-y 0 (+ delta
(window-tab-line-height)
(window-header-line-height))))
(object (posn-object desired-pos))
(desired-start (posn-point desired-pos))
(scroll-area-total-height (cdr (window-text-pixel-size nil
(window-start)
(1- desired-start))))
(desired-vscroll (- delta scroll-area-total-height))
(current-vs (window-vscroll nil t))
(start-posn (unless (eq desired-start (window-start))
(posn-at-point desired-start)))
(desired-vscroll (if start-posn
(- delta (cdr (posn-x-y start-posn)))
(+ current-vs delta)))
(edges (window-edges nil t))
(usable-height (- (nth 3 edges)
(nth 1 edges)))
@ -450,36 +454,24 @@ the height of the current window."
(when (zerop (vertical-motion (1+ scroll-margin)))
(signal 'end-of-buffer nil))
(point)))
(end-pos (posn-at-x-y 0 (+ usable-height
(window-tab-line-height)
(window-header-line-height)))))
(if (or (overlayp object)
(stringp object)
(and (consp object)
(stringp (car object)))
(and (consp (posn-object end-pos))
(> (cdr (posn-object-x-y end-pos)) 0)))
;; We are either on an overlay or a string, so set vscroll
;; directly.
(set-window-vscroll nil (+ (window-vscroll nil t)
delta)
t)
(when (and (or (< (point) next-pos))
(let ((pos-visibility (pos-visible-in-window-p next-pos nil t)))
(and pos-visibility
(or (eq (length pos-visibility) 2)
(when-let* ((posn (posn-at-point next-pos)))
(> (cdr (posn-object-width-height posn))
usable-height))))))
(goto-char next-pos))
(set-window-start nil (if (zerop (window-hscroll))
desired-start
(save-excursion
(goto-char desired-start)
(beginning-of-visual-line)
(point)))
t)
(set-window-vscroll nil desired-vscroll t))))
(scroll-preserve-screen-position nil)
(auto-window-vscroll nil))
(when (and (or (< (point) next-pos))
(let ((pos-visibility (pos-visible-in-window-p next-pos nil t)))
(and pos-visibility
(or (eq (length pos-visibility) 2)
(when-let* ((posn (posn-at-point next-pos)))
(> (cdr (posn-object-width-height posn))
usable-height))))))
(goto-char next-pos))
(set-window-start nil (if (zerop (window-hscroll))
desired-start
(save-excursion
(goto-char desired-start)
(beginning-of-visual-line)
(point)))
t)
(set-window-vscroll nil desired-vscroll t)))
(defun pixel-scroll-precision-scroll-down (delta)
"Scroll the current window down by DELTA pixels."
@ -558,13 +550,14 @@ animation."
(setq time-elapsed (+ time-elapsed
(- (float-time) last-time))
percentage (/ time-elapsed total-time))
(if (< delta 0)
(pixel-scroll-precision-scroll-down
(ceiling (abs (* (* delta factor)
(/ between-scroll total-time)))))
(pixel-scroll-precision-scroll-up
(ceiling (* (* delta factor)
(/ between-scroll total-time)))))
(let ((throw-on-input nil))
(if (< delta 0)
(pixel-scroll-precision-scroll-down
(ceiling (abs (* (* delta factor)
(/ between-scroll total-time)))))
(pixel-scroll-precision-scroll-up
(ceiling (* (* delta factor)
(/ between-scroll total-time))))))
(setq last-time (float-time)))
(if (< percentage 1)
(progn
@ -723,8 +716,6 @@ precisely, according to the turning of the mouse wheel."
:group 'mouse
:keymap pixel-scroll-precision-mode-map
(setq mwheel-coalesce-scroll-events
(not pixel-scroll-precision-mode)
make-cursor-line-fully-visible
(not pixel-scroll-precision-mode)))
(provide 'pixel-scroll)

2
lisp/progmodes/flymake.el
View file

@ -6,7 +6,7 @@
;; Maintainer: João Távora <joaotavora@gmail.com>
;; Version: 1.2.1
;; Keywords: c languages tools
;; Package-Requires: ((emacs "26.1") (eldoc "1.1.0") (project "0.7.1"))
;; Package-Requires: ((emacs "28.1") (eldoc "1.1.0") (project "0.7.1"))
;; This is a GNU ELPA :core package. Avoid functionality that is not
;; compatible with the version of Emacs recorded above.

8
lisp/time.el
View file

@ -526,11 +526,9 @@ If the value is t instead of an alist, use the value of
'((t :inherit font-lock-variable-name-face))
"Face for time zone label in `world-clock' buffer.")
(defvar world-clock-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "n" #'next-line)
(define-key map "p" #'previous-line)
map))
(defvar-keymap world-clock-mode-map
"n" #'next-line
"p" #'previous-line)
(define-derived-mode world-clock-mode special-mode "World clock"
"Major mode for buffer that displays times in various time zones.