mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
Merge remote-tracking branch 'origin/master' into feature/pgtk
This commit is contained in:
Po Lu
commit
cc0f147180
25 changed files with 68 additions and 83 deletions
|
|
@ -2326,7 +2326,7 @@
|
|||
2013-07-03 Christoph Egger <christoph@debian.org> (tiny change)
|
||||
|
||||
* configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
|
||||
http://bugs.debian.org/712974
|
||||
https://bugs.debian.org/712974
|
||||
|
||||
2013-07-02 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ your status as ``being back'' if you do not. People can use the
|
|||
@cindex help about irc
|
||||
Typical IRC servers implement many more commands. You can read more
|
||||
about the fantastic world of IRC online at
|
||||
@uref{http://www.irchelp.org/, the Internet Relay Chat (IRC) help
|
||||
@uref{https://www.irchelp.org/, the Internet Relay Chat (IRC) help
|
||||
archive}.
|
||||
|
||||
@node Configuration
|
||||
|
|
|
|||
|
|
@ -4231,7 +4231,7 @@ It is even possible to access file archives in file archives, as
|
|||
(progn
|
||||
(url-handler-mode 1)
|
||||
(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"))
|
||||
@end group
|
||||
@end lisp
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ can be accessed (usually over a network) in a specific way.
|
|||
|
||||
@example
|
||||
ftp://ftp.is.co.za/rfc/rfc1808.txt
|
||||
http://www.ietf.org/rfc/rfc2396.txt
|
||||
https://www.ietf.org/rfc/rfc2396.txt
|
||||
ldap://[2001:db8::7]/c=GB?objectClass?one
|
||||
mailto:John.Doe@@example.com
|
||||
news:comp.infosystems.www.servers.unix
|
||||
|
|
@ -708,7 +708,7 @@ Well-known ports are used if the URL does not specify a port.
|
|||
@cindex rcirc
|
||||
|
||||
The @code{irc} scheme is defined in the Internet Draft at
|
||||
@url{http://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
|
||||
@url{https://www.w3.org/Addressing/draft-mirashi-url-irc-01.txt} (which
|
||||
was never approved as an RFC). Such URLs have the form
|
||||
|
||||
@example
|
||||
|
|
@ -1181,7 +1181,7 @@ opened by the URL library.
|
|||
@c machines off the local network. This is characterized by being able
|
||||
@c to reach someplace with a raw ip number, but not its hostname
|
||||
@c (@url{http://129.79.254.191/} works, but
|
||||
@c @url{http://www.cs.indiana.edu/} doesn't). This used to happen on
|
||||
@c @url{https://www.cs.indiana.edu/} doesn't). This used to happen on
|
||||
@c SunOS4 and Ultrix, but is now probably now rare. If Emacs can't be
|
||||
@c rebuilt linked against the resolver library, it can use the external
|
||||
@c @command{nslookup} program instead.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ license notice.
|
|||
They are copies of those distributed with a free package
|
||||
called CCE at:
|
||||
|
||||
http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
|
||||
As the original files don't contain copyright and license notices, a
|
||||
proper notice is extracted from the file Copyright and added at the
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
% This file is included in the free package called CCE. It is
|
||||
% available in:
|
||||
%
|
||||
% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
%
|
||||
% As the file itself doesn't contain copyright and license notices,
|
||||
% the following statements of the file cce/Copyright covers it.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
% This file is included in the free package called CCE. It is
|
||||
% available in:
|
||||
%
|
||||
% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
% https://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
|
||||
%
|
||||
% As the file itself doesn't contain copyright and license notices,
|
||||
% the following statements of the file cce/Copyright covers it.
|
||||
|
|
|
|||
|
|
@ -1474,7 +1474,6 @@ set_local_socket (char const *server_name)
|
|||
else
|
||||
{
|
||||
/* socket_name is a file name component. */
|
||||
sock_status = ENOENT;
|
||||
char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR");
|
||||
if (xdg_runtime_dir)
|
||||
{
|
||||
|
|
@ -1484,7 +1483,7 @@ set_local_socket (char const *server_name)
|
|||
? connect_socket (AT_FDCWD, sockname, s, 0)
|
||||
: ENAMETOOLONG);
|
||||
}
|
||||
if (sock_status == ENOENT)
|
||||
else
|
||||
{
|
||||
char const *tmpdir = egetenv ("TMPDIR");
|
||||
if (tmpdir)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
;; ======================================================================
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue