Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
This commit is contained in:
Eli Zaretskii
commit
ef8fdd269a
42 changed files with 78 additions and 60 deletions
|
|
@ -1789,3 +1789,16 @@ ine\\(?:-global\\)?-minor-mode\\|ine-compilation-mode\\|un-cvs-mode\\|\
|
|||
(oarticle (make-symbol "gnus-setup-message-oarticle"))
|
||||
(,oarticle gnus-article-reply)
|
||||
(gnus-inews-add-send-actions ,winconf ,buffer ,oarticle ,config
|
||||
Thur, Fri, Sat, Sun
|
||||
[3]: Merget, Brinkmann, Aviram, Somorovsky, Mittmann, and
|
||||
(ansi-color-cyan :short "ansi-cyan" :slug "anc" :foreground ,fg-term-cyan)
|
||||
(ansi-color-bright-cyan :short "ansi-bright-cyan" :slug "ANc" :foreground ,fg-term-cyan-bright)
|
||||
(search-forward "foo.correc")
|
||||
"Your finger was not centred, try swiping your finger again"
|
||||
(ofrom (marker-position (widget-get group :from)))
|
||||
(should (= ofrom (widget-get group :from)))
|
||||
(ofrom (marker-position (widget-get group :from)))
|
||||
(should (= ofrom (widget-get group :from)))
|
||||
(should (equal (cl-subseq "hello world" -5 -1) "worl"))
|
||||
("\\.te?xi\\'" . texinfo-mode)
|
||||
("\\.te?xt\\'" . text-mode)
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ queries that has problems with latest grammar."
|
|||
(special-mode))))
|
||||
|
||||
(defun treesit-admin-verify-major-mode-queries ()
|
||||
"Varify font-lock queries in builtin major modes.
|
||||
"Verify font-lock queries in builtin major modes.
|
||||
|
||||
If the font-lock queries work fine with the latest grammar, insert some
|
||||
comments in the source file saying that the modes are known to work with
|
||||
|
|
@ -296,7 +296,7 @@ instead.
|
|||
|
||||
Return a plist of the form
|
||||
|
||||
(:version VERSION :head-version HEAD-VERSION :timstamp TIMESTAMP).
|
||||
(:version VERSION :head-version HEAD-VERSION :timestamp TIMESTAMP).
|
||||
|
||||
HEAD-VERSION is the version of the HEAD, VERSION is the latest
|
||||
compatible version. TIMESTAMP is the commit date of VERSION in UNIX
|
||||
|
|
@ -371,14 +371,14 @@ VERSION and HEAD-VERSION in the plist are the same as in
|
|||
|
||||
(defun treesit-admin--generate-compatibility-report
|
||||
(emacs-executables modes out-file)
|
||||
"Generate a table for language compatibiity for MODES.
|
||||
"Generate a table for language compatibility for MODES.
|
||||
|
||||
Note that this only works for Emacs 31 and later, because before Emacs
|
||||
31 we can't validate a compiled query (because there's a bug preventing
|
||||
us from eager compiling a compiled query that's already lazily
|
||||
compiled).
|
||||
|
||||
EMACS-EXECUTABLES is a list of Emacs executbles to check for."
|
||||
EMACS-EXECUTABLES is a list of Emacs executables to check for."
|
||||
(let ((tables
|
||||
(mapcar
|
||||
(lambda (emacs)
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ images, and this image will be put on the clipboard. On capable
|
|||
platforms, Emacs can yank these objects with the @code{yank-media}
|
||||
command---but only in modes that have support for it. By default, it
|
||||
auto-selects the preferred media type available in the clipboard but
|
||||
this can be overriden by giving the prefix argument to the command
|
||||
this can be overridden by giving the prefix argument to the command
|
||||
(@pxref{Yanking Media,,, elisp, The Emacs Lisp Reference Manual}).
|
||||
|
||||
@cindex clipboard manager
|
||||
|
|
|
|||
|
|
@ -963,7 +963,7 @@ the format to use.
|
|||
|
||||
@cindex @code{staticpro}, protection from GC
|
||||
If you directly define a file-scope C variable of type
|
||||
@code{Lisp_Object}, you must protect it from garbage-collection by
|
||||
@code{Lisp_Object}, you must protect it from garbage collection by
|
||||
calling @code{staticpro} in @code{syms_of_@var{filename}}, like this:
|
||||
|
||||
@example
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ the symbol name with first letter capitalized. For languages that has
|
|||
``irregular'' names, @var{treesit-language-display-name-alist} maps
|
||||
language symbols to their display names.
|
||||
|
||||
If a major mode package uses a langauge with ``irregular'' name, they
|
||||
If a major mode package uses a language with ``irregular'' name, they
|
||||
should add a mapping into @var{treesit-language-display-name-alist} on
|
||||
load.
|
||||
@end defun
|
||||
|
|
|
|||
|
|
@ -4188,7 +4188,7 @@ position of a later line. Instead, that anchor position is the latest
|
|||
line at the same level of nesting before the labeled line without a
|
||||
leading label or comment. If there is no such line, the latest line
|
||||
containing an enclosing opening brace or parenthesis, which doesn't
|
||||
start with a label or comment, provides the anchor postion. In this
|
||||
start with a label or comment, provides the anchor position. In this
|
||||
case extra syntactic element(s) with syntactic symbol
|
||||
@code{defun-block-intro}, @code{statement-block-intro}, or some other
|
||||
``-intro'' symbol are inserted into the syntactic context to allow the
|
||||
|
|
|
|||
|
|
@ -6239,7 +6239,7 @@ as above in your @file{~/.emacs}:
|
|||
@item
|
||||
I get an error @samp{unix_listener: path
|
||||
"/very/long/path/.cache/emacs/tramp.XXX" too long for Unix domain
|
||||
socket} when connectiong via @option{ssh} to a remote host.
|
||||
socket} when connecting via @option{ssh} to a remote host.
|
||||
|
||||
@vindex small-temporary-file-directory
|
||||
By default, @value{tramp} uses the directory @file{~/.cache/emacs/}
|
||||
|
|
|
|||
8
etc/NEWS
8
etc/NEWS
|
|
@ -348,7 +348,7 @@ This input method has support for polytonic and archaic Greek
|
|||
characters.
|
||||
|
||||
---
|
||||
*** New language-environment and input method for Tifinagh.
|
||||
*** New language environment and input method for Tifinagh.
|
||||
The Tifinagh script is used to write the Berber languages.
|
||||
|
||||
---
|
||||
|
|
@ -473,8 +473,8 @@ a web browser to load them. For example, it could be used like this:
|
|||
(add-to-list 'browse-url-transform-alist
|
||||
'("www.google.com" . "www.duckduckgo.com"))
|
||||
|
||||
*** New function 'browse-url-qutebrowser' for the Qutebrowser.
|
||||
For better integration with the Qutebrowser, set
|
||||
*** New function 'browse-url-qutebrowser' for Qutebrowser.
|
||||
For better integration with Qutebrowser, set
|
||||
'browse-url(-secondary)-browser-function' to 'browse-url-qutebrowser'.
|
||||
|
||||
*** New GTK-native launch mode.
|
||||
|
|
@ -1269,7 +1269,7 @@ observed on Android).
|
|||
|
||||
+++
|
||||
*** 'yank-media' now auto-selects the most preferred MIME type.
|
||||
Major-mode authors can customise the variables
|
||||
Major-mode authors can customize the variables
|
||||
'yank-media-autoselect-function' and/or 'yank-media-preferred-types' to
|
||||
change the selection rules.
|
||||
|
||||
|
|
|
|||
|
|
@ -1559,7 +1559,7 @@ either an internal or external browser.
|
|||
If a remote file is specified, a local temporary copy of that file is
|
||||
passed to the browser.
|
||||
|
||||
*** Support for the conkeror browser is now obsolete.
|
||||
*** Support for the Conkeror browser is now obsolete.
|
||||
|
||||
*** Support for the Mosaic browser has been removed.
|
||||
This support has been obsolete since 25.1.
|
||||
|
|
|
|||
|
|
@ -5568,7 +5568,7 @@ the end of the string.
|
|||
|
||||
*** Function ~org-info-export~ changes.
|
||||
|
||||
HTML links created from certain info links now point to =gnu.org= URL's rather
|
||||
HTML links created from certain info links now point to =gnu.org= URLs rather
|
||||
than just to local files. For example info links such as =info:emacs#List
|
||||
Buffers= used to be converted to HTML links like this:
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ See `auth-source-pass-get'."
|
|||
"Return a string with the file content of ENTRY."
|
||||
(with-temp-buffer
|
||||
;; `file-name-handler-alist' could be nil, or miss the
|
||||
;; `epa-file-handler' entry. We ensure, that it does exist.
|
||||
;; `epa-file-handler' entry. We ensure that it does exist.
|
||||
;; (Bug#67937)
|
||||
(let ((file-name-handler-alist
|
||||
(cons epa-file-handler file-name-handler-alist)))
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ The format is an alist, with string keys ABBREV-UNIT, and elements like:
|
|||
|
||||
(ABBREV-UNIT UNIT UNIT-PLURAL SECS)
|
||||
|
||||
where UNIT is a unit of time, ABBREV-UNIT is the abreviated form of
|
||||
where UNIT is a unit of time, ABBREV-UNIT is the abbreviated form of
|
||||
UNIT, UNIT-PLURAL is the plural form of UNIT, and SECS is the number of
|
||||
seconds per UNIT.")
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
|
|||
|
||||
(princ "\nBox vertical line glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-vertical))
|
||||
(princ "\nBox horizonal line glyph: ")
|
||||
(princ "\nBox horizontal line glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-horizontal))
|
||||
(princ "\nBox upper left corner glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-down-right))
|
||||
|
|
@ -125,7 +125,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
|
|||
|
||||
(princ "\nBox double vertical line glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-double-vertical))
|
||||
(princ "\nBox double horizonal line glyph: ")
|
||||
(princ "\nBox double horizontal line glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-double-horizontal))
|
||||
(princ "\nBox double upper left corner glyph: ")
|
||||
(prin1 (display-table-slot dt 'box-double-down-right))
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ This function is considered deprecated in favor of the built-in function
|
|||
"Return t if INTEGER is odd.
|
||||
|
||||
This function is considered deprecated in favor of the built-in function
|
||||
`evenp' that was added in Emacs 31.1.")
|
||||
`oddp' that was added in Emacs 31.1.")
|
||||
|
||||
(defalias 'cl-evenp #'evenp
|
||||
"Return t if INTEGER is even.
|
||||
|
|
|
|||
|
|
@ -271,7 +271,11 @@ asynchronously."
|
|||
(defun package-vc--generate-description-file (pkg-desc pkg-file)
|
||||
"Generate a package description file for PKG-DESC and write it to PKG-FILE."
|
||||
(let ((name (package-desc-name pkg-desc)))
|
||||
;; Infer the subject if missing.
|
||||
(when (equal (package-desc-summary pkg-desc) package--default-summary)
|
||||
;; We unset the package description if it is just the default
|
||||
;; summary, so that the following heuristic can take effect.
|
||||
(setf (package-desc-summary pkg-desc) nil))
|
||||
;; Infer the package description if missing.
|
||||
(unless (package-desc-summary pkg-desc)
|
||||
(setf (package-desc-summary pkg-desc)
|
||||
(let ((main-file (package-vc--main-file pkg-desc)))
|
||||
|
|
|
|||
|
|
@ -4525,7 +4525,7 @@ of an installed ELPA package.
|
|||
The return value is a string (or nil in case we can't find it).
|
||||
It works in more cases if the call is in the file which contains
|
||||
the `Version:' header."
|
||||
;; In a sense, this is a lie, but it does just what we want: precompute
|
||||
;; In a sense, this is a lie, but it does just what we want: precomputes
|
||||
;; the version at compile time and hardcodes it into the .elc file!
|
||||
(declare (pure t))
|
||||
;; Hack alert!
|
||||
|
|
|
|||
|
|
@ -403,7 +403,7 @@ If CANCEL-ON-INPUT is non-nil and the user inputs something while the
|
|||
function is waiting, then any future replies to the request by the
|
||||
remote endpoint (normal or error) are ignored and the function exits
|
||||
returning CANCEL-ON-INPUT-RETVAL. If CANCEL-ON-INPUT is a function, it
|
||||
is invoked with one argument, an integer identifying the cancelled
|
||||
is invoked with one argument, an integer identifying the canceled
|
||||
request as specified in the JSONRPC 2.0 spec."
|
||||
(let* ((tag (cl-gensym "jsonrpc-request-catch-tag")) id-and-timer
|
||||
canceled
|
||||
|
|
|
|||
|
|
@ -356,7 +356,7 @@ for `smtpmail-try-auth-method'.")
|
|||
(erase-buffer))))
|
||||
;; Encode the header according to RFC2047.
|
||||
(mail-encode-header (point-min) delimline)
|
||||
;; Get recipients' adresses
|
||||
;; Get recipients' addresses
|
||||
(setq smtpmail-recipient-address-list
|
||||
(smtpmail-deduce-address-list tembuf (point-min) delimline))
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ Non-nil if EWW should ask for confirmation before sending the
|
|||
selected region to the configured search engine. This is the
|
||||
default to mitigate the risk of accidental data leak. Set this
|
||||
variable to nil to send the region to the search engine
|
||||
straightaway."
|
||||
straight away."
|
||||
:version "31.1"
|
||||
:group 'eww
|
||||
:type 'boolean)
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ were rampant use of small subgroup prime or composite number for DHE by
|
|||
many servers, and thus allowed themselves to be vulnerable to
|
||||
backdoors[1]. Given the difficulty in validating Diffie-Hellman
|
||||
parameters, major browser vendors had started to remove DHE since
|
||||
2016[2]. In 2020, the so-called Racoon Attack was discovered, a
|
||||
2016[2]. In 2020, the so-called Raccoon Attack was discovered, a
|
||||
server-side vulnerability that exploits a side-channel to get the shared
|
||||
secret key[3].
|
||||
|
||||
|
|
|
|||
|
|
@ -4107,8 +4107,9 @@ This function expects to be in the right *tramp* buffer."
|
|||
vec (format "%s type -P %s 2>%s"
|
||||
(if dirlist (concat "PATH=" (string-join dirlist ":")) "")
|
||||
progname (tramp-get-remote-null-device vec)))
|
||||
(unless (zerop (buffer-size))
|
||||
(string-trim (buffer-string)))))
|
||||
(goto-char (point-min))
|
||||
(when (search-forward-regexp "/" nil 'noerror)
|
||||
(string-trim (buffer-substring (match-beginning 0) (point-max))))))
|
||||
|
||||
;; On hydra.nixos.org, the $PATH environment variable is too long to
|
||||
;; send it. This is likely not due to PATH_MAX, but PIPE_BUF. We
|
||||
|
|
|
|||
|
|
@ -918,7 +918,7 @@ comment delimiters."
|
|||
(when (> beg end) (setq beg (prog1 end (setq end beg))))
|
||||
;; Bind `comment-use-global-state' to nil. While uncommenting a region
|
||||
;; (which works a line at a time), a comment can appear to be
|
||||
;; included in a mult-line string, but it is actually not.
|
||||
;; included in a multi-line string, but it is actually not.
|
||||
(let ((comment-use-global-state nil))
|
||||
(save-excursion
|
||||
(funcall uncomment-region-function beg end arg))))
|
||||
|
|
|
|||
|
|
@ -538,7 +538,7 @@ characters on the current line."
|
|||
;;; Baseline indent rule
|
||||
|
||||
(defvar c-ts-common-list-indent-style 'align
|
||||
"Intructs `c-ts-common-baseline-indent-rule' how to indent lists.
|
||||
"Instructs `c-ts-common-baseline-indent-rule' how to indent lists.
|
||||
|
||||
If the value is `align', indent lists like this:
|
||||
|
||||
|
|
@ -594,7 +594,7 @@ chaining like
|
|||
.method() front of the node.
|
||||
|
||||
But ff `treesit-simple-indent-standalone-predicate' is non-nil, use that
|
||||
for determining standlone line."
|
||||
for determining standalone line."
|
||||
(let (anchor)
|
||||
(save-excursion
|
||||
(catch 'term
|
||||
|
|
@ -620,7 +620,7 @@ chaining like
|
|||
.method() front of the node.
|
||||
|
||||
But ff `treesit-simple-indent-standalone-predicate' is non-nil, use that
|
||||
for determining standlone line."
|
||||
for determining standalone line."
|
||||
(save-excursion
|
||||
(setq node (treesit-node-prev-sibling node 'named))
|
||||
(goto-char (treesit-node-start node))
|
||||
|
|
@ -710,7 +710,7 @@ The rule also handles method chaining like
|
|||
(rx (or "(" "[")))
|
||||
(let ((first-sibling (treesit-node-child parent 0 'named)))
|
||||
(cond
|
||||
;; Closing delimeters.
|
||||
;; Closing delimiters.
|
||||
((treesit-node-match-p node (rx (or ")" "]")))
|
||||
(if (eq c-ts-common-list-indent-style 'align)
|
||||
(cons (treesit-node-start (treesit-node-child parent 0))
|
||||
|
|
|
|||
|
|
@ -7522,7 +7522,7 @@ multi-line strings (but not C++, for example)."
|
|||
"Construct a regexp for a C++ raw string opener matching CLOSER."
|
||||
(concat "\\(R\\(\"\\)" (regexp-quote (substring closer 1 -1)) "(\\)"))
|
||||
|
||||
;; The positions of various components of mult-line strings surrounding BEG,
|
||||
;; The positions of various components of multi-line strings surrounding BEG,
|
||||
;; END and (1- BEG) (of before-change-functions) as returned by
|
||||
;; `c-ml-string-delims-around-point'.
|
||||
(defvar c-old-beg-ml nil)
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ under cursor."
|
|||
(const :tag "Call hierarchies" :callHierarchyProvider)))
|
||||
|
||||
(defcustom eglot-advertise-cancellation nil
|
||||
"If non-nil, Eglot attemps to inform server of cancelled requests.
|
||||
"If non-nil, Eglot attempts to inform server of canceled requests.
|
||||
This is done by sending an additional '$/cancelRequest' notification
|
||||
every time Eglot decides to forget a request. The effect of this
|
||||
notification is implementation defined, and is only useful for some
|
||||
|
|
|
|||
|
|
@ -7230,7 +7230,7 @@ implementations: `python-mode' and `python-ts-mode'."
|
|||
(when python-indent-guess-indent-offset
|
||||
(python-indent-guess-indent-offset))
|
||||
|
||||
(add-to-list 'auto-mode-alist (cons python--auto-mode-alist-regexp 'python-ts-mode))
|
||||
(add-to-list 'auto-mode-alist (cons python--auto-mode-alist-regexp 'python-ts-mode))
|
||||
(add-to-list 'interpreter-mode-alist '("python[0-9.]*" . python-ts-mode))))
|
||||
|
||||
(derived-mode-add-parents 'python-ts-mode '(python-mode))
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
|
|||
(ignore-errors
|
||||
(treesit-query-compile language queries-b t)
|
||||
queries-b)
|
||||
;; Return a dummy query that doens't do anything, if neither
|
||||
;; Return a dummy query that doesn't do anything, if neither
|
||||
;; query works.
|
||||
'("," @_ignore))))
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ If this is a function, call it to generate the initial field text."
|
|||
:risky t)
|
||||
;; The functionality provided by `bibtex-include-OPTkey' is a special case
|
||||
;; of what `bibtex-aux-opt-alist' offers. Which BibTeX style files actually
|
||||
;; use the key field? The BibTeX docomentation suggests it is used rarely.
|
||||
;; use the key field? The BibTeX documentation suggests it is used rarely.
|
||||
;; Under biblatex, the key field is an alias for sortkey, see Secs. 2.2.3
|
||||
;; and 2.2.5.
|
||||
(make-obsolete-variable 'bibtex-include-OPTkey
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ By default should have same value as `html-ts-mode-indent-offset'."
|
|||
executable html-ts-mode-indent-offset))
|
||||
((setq executable (executable-find "xmllint"))
|
||||
(format "%s --html --quiet --format -" executable))
|
||||
(t "Install tidy, ore some other HTML pretty print tool, and set `mhtml-ts-mode-pretty-print-command'.")))
|
||||
(t "Install tidy, or some other HTML pretty print tool, and set `mhtml-ts-mode-pretty-print-command'.")))
|
||||
"The command to pretty print the current HTML buffer."
|
||||
:type 'string
|
||||
:version "31.1")
|
||||
|
|
@ -522,7 +522,7 @@ Powered by tree-sitter."
|
|||
js--treesit-jsdoc-comment-regexp))
|
||||
|
||||
|
||||
;; Many treesit fuctions need to know the language at-point.
|
||||
;; Many treesit functions need to know the language at-point.
|
||||
;; So you should define such a function.
|
||||
(setq-local treesit-language-at-point-function #'mhtml-ts-mode--language-at-point)
|
||||
(setq-local prettify-symbols-alist mhtml-ts-mode--prettify-symbols-alist)
|
||||
|
|
@ -594,7 +594,7 @@ Powered by tree-sitter."
|
|||
;; Flymake
|
||||
(add-hook 'flymake-diagnostic-functions #'mhtml-ts-mode-flymake-mhtml nil 'local)))
|
||||
|
||||
;; Add nome extra parents.
|
||||
;; Add some extra parents.
|
||||
(derived-mode-add-parents 'mhtml-ts-mode '(css-mode js-mode))
|
||||
|
||||
(when (and (treesit-ready-p 'html) (treesit-ready-p 'javascript) (treesit-ready-p 'css))
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
|
|||
;; the menu entry and the keybinding by two spaces
|
||||
;; because we added two characters at the front (one
|
||||
;; digit and one space) and this would cause a
|
||||
;; misalignement otherwise.
|
||||
;; misalignment otherwise.
|
||||
(tmm--shorten-space-width
|
||||
(concat (propertize (char-to-string char) 'face 'highlight)
|
||||
" " str)))
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
;; so there will be more than one parser for each language in a buffer.
|
||||
;; We can also have local parser of the same language as the host
|
||||
;; parser. All of which means we can't equalize language and parser,
|
||||
;; and create paresr for a language willy-nilly anymore. Major mode
|
||||
;; and create parser for a language willy-nilly anymore. Major mode
|
||||
;; will manage their parsers.
|
||||
|
||||
;;; Code:
|
||||
|
|
@ -1843,7 +1843,7 @@ but not in this case:
|
|||
}
|
||||
|
||||
The value of this variable affects the `standalone-parent' indent preset
|
||||
for treesit-simple-indent. If the value is nil, the standlone condition
|
||||
for treesit-simple-indent. If the value is nil, the standalone condition
|
||||
is as described. Some major mode might want to relax the condition a
|
||||
little bit, so that it ignores some punctuation like \".\". For
|
||||
example, a Javascript mode might want to consider the method call below
|
||||
|
|
@ -2516,7 +2516,7 @@ This function only affects `treesit-simple-indent-rules',
|
|||
|
||||
WHERE can be either :before or :after, which means adding RULES before
|
||||
or after the existing rules in `treesit-simple-indent-rules'. If
|
||||
ommited, default to adding the rules before (so it overrides existing
|
||||
omitted, default to adding the rules before (so it overrides existing
|
||||
rules).
|
||||
|
||||
If ANCHOR is non-nil, add RULES before/after the rules in
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ where HEIGHT and WIDTH are the normal height and width of the window.
|
|||
(nreverse list)))
|
||||
|
||||
(defsubst window--rotate-interactive-arg ()
|
||||
"Return interative window argument for window rotation commands."
|
||||
"Return interactive window argument for window rotation commands."
|
||||
(if current-prefix-arg (window-parent) (window-main-window)))
|
||||
|
||||
;;;###autoload
|
||||
|
|
|
|||
|
|
@ -1357,7 +1357,7 @@ buffer_local_value (Lisp_Object variable, Lisp_Object buffer)
|
|||
case SYMBOL_LOCALIZED:
|
||||
{ /* Look in local_var_alist. */
|
||||
struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
|
||||
XSETSYMBOL (variable, sym); /* Update In case of aliasing. */
|
||||
XSETSYMBOL (variable, sym); /* Update in case of aliasing. */
|
||||
result = assq_no_quit (variable, BVAR (buf, local_var_alist));
|
||||
if (!NILP (result))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3514,7 +3514,7 @@ make_matrix_current (struct frame *f)
|
|||
|
||||
/* Prepare ROOT's desired row at index Y for copying child frame
|
||||
contents to it. Value is the prepared desired row or NULL if we
|
||||
don't have, and can't contruct a desired row. */
|
||||
don't have, and can't construct a desired row. */
|
||||
|
||||
static struct glyph_row *
|
||||
prepare_desired_root_row (struct frame *root, int y)
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ doprnt_non_null_end (char *buffer, ptrdiff_t bufsize, char const *format,
|
|||
return nbytes;
|
||||
}
|
||||
|
||||
/* Format to BUFFER (of positive size BUFSIZE) data formated by FORMAT,
|
||||
/* Format to BUFFER (of positive size BUFSIZE) data formatted by FORMAT,
|
||||
terminated at either the first NUL or (if FORMAT_END is non-null
|
||||
and there are no NUL bytes between FORMAT and FORMAT_END)
|
||||
terminated at position FORMAT_END. AP specifies format arguments.
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ char const EXTERNALLY_VISIBLE RCS_Id[]
|
|||
= "$Id" ": GNU Emacs " PACKAGE_VERSION
|
||||
" (" EMACS_CONFIGURATION " " EMACS_CONFIG_FEATURES ") $";
|
||||
|
||||
/* Empty lisp strings. To avoid having to build any others. */
|
||||
/* Empty Lisp strings. To avoid having to build any others. */
|
||||
Lisp_Object empty_unibyte_string, empty_multibyte_string;
|
||||
|
||||
#ifdef WINDOWSNT
|
||||
|
|
@ -3539,7 +3539,7 @@ Also note that this is not a generic facility for accessing external
|
|||
libraries; only those already known by Emacs will be loaded. */);
|
||||
#ifdef WINDOWSNT
|
||||
/* FIXME: We may need to load libgccjit when dumping before
|
||||
term/w32-win.el defines `dynamic-library-alist`. This will fail
|
||||
term/w32-win.el defines `dynamic-library-alist`. This will fail
|
||||
if that variable is empty, so add libgccjit-0.dll to it. */
|
||||
if (will_dump_p ())
|
||||
Vdynamic_library_alist = list1 (list2 (Qgccjit,
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
|
|||
/* Menu bars on child frames don't work on all platforms, which is
|
||||
the reason why prepare_menu_bar does not update_menu_bar for
|
||||
child frames (info from Martin Rudalics). This could be
|
||||
implemented in ttys, but it's probaly not worth it. */
|
||||
implemented in ttys, but it's probably not worth it. */
|
||||
if (is_tty_child_frame (f))
|
||||
{
|
||||
FRAME_MENU_BAR_LINES (f) = 0;
|
||||
|
|
|
|||
|
|
@ -12030,7 +12030,7 @@ svg_css_length_to_pixels (RsvgLength length, double dpi, int font_size)
|
|||
The basic process, which is used for all versions of librsvg, is to
|
||||
load the SVG and parse it, then extract the image dimensions. We
|
||||
then use those image dimensions to calculate the final size and
|
||||
wrap the SVG data inside another SVG we build on the fly. This
|
||||
wrap the SVG data inside another SVG we build on the fly. This
|
||||
wrapper does the necessary resizing and setting of foreground and
|
||||
background colors and is then parsed and rasterized.
|
||||
|
||||
|
|
@ -12117,8 +12117,8 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
|
|||
rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err);
|
||||
if (err) goto rsvg_error;
|
||||
|
||||
/* The parsing is complete, rsvg_handle is ready to be used, close
|
||||
it for further writes. */
|
||||
/* The parsing is complete, rsvg_handle is ready to be used, close it
|
||||
for further writes. */
|
||||
rsvg_handle_close (rsvg_handle, &err);
|
||||
if (err) goto rsvg_error;
|
||||
#endif
|
||||
|
|
@ -12348,7 +12348,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
|
|||
SBYTES (wrapped_contents), &err);
|
||||
if (err) goto rsvg_error;
|
||||
|
||||
/* The parsing is complete, rsvg_handle is ready to used, close it
|
||||
/* The parsing is complete, rsvg_handle is ready to be used, close it
|
||||
for further writes. */
|
||||
rsvg_handle_close (rsvg_handle, &err);
|
||||
if (err) goto rsvg_error;
|
||||
|
|
|
|||
|
|
@ -4295,7 +4295,7 @@ types. */)
|
|||
dump_emacs_reloc_to_emacs_ptr_raw (ctx, &staticvec[i], staticvec[i]);
|
||||
dump_emacs_reloc_immediate_int (ctx, &staticidx, staticidx);
|
||||
|
||||
/* Dump until while we keep finding objects to dump. We add new
|
||||
/* Dump while we keep finding objects to dump. We add new
|
||||
objects to the queue by side effect during dumping.
|
||||
We accumulate some types of objects in special lists to get more
|
||||
locality for these object types at runtime. */
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ pgtk_enumerate_devices (struct pgtk_display_info *dpyinfo,
|
|||
else
|
||||
{
|
||||
/* GTK bug 7737 results in GDK seats being initialized
|
||||
with NULL devices in some cirumstances. As events will
|
||||
with NULL devices in some circumstances. As events will
|
||||
presumably also be delivered with their device fields
|
||||
set to NULL, insert a ersatz device record associated
|
||||
with NULL. (bug#76239) */
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ struct wav_header
|
|||
u_int32_t data_length;
|
||||
};
|
||||
|
||||
/* The file header of Sun adio files (*.au). Files are always in
|
||||
/* The file header of Sun audio files (*.au). Files are always in
|
||||
big-endian byte-order. */
|
||||
|
||||
struct au_header
|
||||
|
|
|
|||
|
|
@ -17466,7 +17466,7 @@ redisplay_internal (void)
|
|||
|
||||
if (is_tty_frame (f))
|
||||
{
|
||||
/* Ignore all invisble tty frames, children or root. */
|
||||
/* Ignore all invisible tty frames, children or root. */
|
||||
if (!frame_redisplay_p (f))
|
||||
continue;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue