mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Merge from origin/emacs-29

Browse Source 
2773cf9e01 ; Fix typos
020aff95fa ; Fix typos in ChangeLog files
5e03a621ef ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--else-heuristi...
f0734e1c0d Fix c-ts-mode indent heuristic (bug#67417)
08fc6bace2 Fix c-ts-mode indentation (bug#67357)
71bc2815cc Add font-locking for hash-bang lines in typescript-ts-mode.
db8347c8c8 Add font-locking for hash-bang lines in js-ts-mode
91f2ade57b ruby-mode: Better detect regexp vs division (bug#67569)
This commit is contained in:
Eli Zaretskii 2023-12-10 10:35:54 -05:00
commit 0da2a4650c
31 changed files with 533 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog.2
View File

@ -8956,10 +8956,10 @@
2016-02-04 Carlos Pita <carlosjosepita@gmail.com> (tiny change)
Make complection in erc use consistent casing
Make completion in erc use consistent casing
* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
case in the complection consistent (bug#18509).
case in the completion consistent (bug#18509).
2016-02-04 Francis Litterio <flitterio@gmail.com>
@ -17094,11 +17094,11 @@
* lisp/json.el (json-encoding-object-sort-predicate): New variable
for specifying a sorting predicate for JSON objects during encoding.
(json--plist-to-alist): New utility function.
(json-encode-hash-table): Re-use `json-encode-alist' when object keys
(json-encode-hash-table): Reuse `json-encode-alist' when object keys
are to be sorted.
(json-encode-alist): Sort output by
`json-encoding-object-sort-predicate, when set.
(json-encode-plist): Re-use `json-encode-alist' when object keys are
(json-encode-plist): Reuse `json-encode-alist' when object keys are
to be sorted.
(json-pretty-print-buffer-ordered): New command to pretty print the
buffer with object keys sorted alphabetically.
@ -19542,7 +19542,7 @@
calling low-level functions.
* test/automated/file-notify-tests.el (file-notify--test-timeout):
Decrase to 6 seconds for remote directories.
Decrease to 6 seconds for remote directories.
(file-notify-test02-events): Expect different number of
`attribute-changed' events for the local and remote cases. Apply
short delays between the operations, in order to receive all
@ -32624,7 +32624,7 @@
(verilog-set-auto-endcomments): Fix end comments for functions of
type void, etc. Reported by Alex Reed.
(verilog-do-indent): Fix electric tab deleting form-feeds. Note
caused by indent-line-to deleting tabls pre 24.5.
caused by indent-line-to deleting tables pre 24.5.
(verilog-nameable-item-re): Fix nameable items that can have an
end-identifier to include endchecker, endgroup, endprogram,
endproperty, and endsequence. Reported by Alex Reed.

90
ChangeLog.3
View File

@ -146,7 +146,7 @@
2022-10-04 Andreas Schwab <schwab@linux-m68k.org>
* src/emacs.c (load_pdump): Propery handle case when executable
* src/emacs.c (load_pdump): Properly handle case when executable
wasn't found.
2022-10-04 Eli Zaretskii <eliz@gnu.org>
@ -6570,7 +6570,7 @@
2021-10-04 Lars Ingebrigtsen <larsi@gnus.org>
Mention ffap-file-name-with-spaces in the ffap doc strin
Mention ffap-file-name-with-spaces in the ffap doc string
* lisp/ffap.el (find-file-at-point): Mention
ffap-file-name-with-spaces in the doc string.
@ -7174,7 +7174,7 @@
(ess-eval-visibly-p): Declare.
(org-babel-julia-assign-elisp): Remove unused vars `header` and
`row-names` and corespondingly remove now unused args `colnames-p` and
`row-names` and correspondingly remove now unused args `colnames-p` and
`rownames-p`.
(org-babel-variable-assignments:julia): Adjust call to
`org-babel-julia-assign-elisp` accordingly.
@ -10203,7 +10203,7 @@
2021-09-17 Lars Ingebrigtsen <larsi@gnus.org>
Mention that the garbage collection is convervative
Mention that the garbage collection is conservative
* doc/lispref/internals.texi (Garbage Collection): Mention that
we're using a conservative gc (bug#42013).
@ -21832,7 +21832,7 @@
* src/doprnt.c (exprintf, evxprintf):
* src/lisp.h (exprintf, evxprintf): Don't use a pointer-to-const type
for the `nonheapbuf` argument: although it is never dereferenced, GCC
will warn when passing a pointer to uninitialised memory otherwise.
will warn when passing a pointer to uninitialized memory otherwise.
* src/fns.c (sort_vector_copy, realize_face, realize_gui_face)
(realize_tty_face): Use the same signatures in the prototypes as in
the actual function definitions.
@ -23755,7 +23755,7 @@
2021-05-29 Lars Ingebrigtsen <larsi@gnus.org>
Improve the file-accessible-directory-p doc strin
Improve the file-accessible-directory-p doc string
* src/fileio.c (Ffile_accessible_directory_p): Don't use the
phrase "directory name spec", which isn't defined (bug#18201).
@ -44752,7 +44752,7 @@
(nxml-prefer-utf-16-little-to-big-endian-flag)
(nxml-default-buffer-file-coding-system)
(nxml-auto-insert-xml-declaration-flag): Add :safe to allow easier
cusomization (bug#45969).
customization (bug#45969).
2021-01-19 Lars Ingebrigtsen <larsi@gnus.org>
@ -47582,10 +47582,10 @@
2020-12-30 Andrea Corallo <akrl@sdf.org>
Order function types in aphabetical order
Order function types in alphabetical order
* lisp/emacs-lisp/comp.el (comp-known-type-specifiers): Reorder in
aphabetical order and comment.
alphabetical order and comment.
2020-12-30 Andrea Corallo <akrl@sdf.org>
@ -55395,7 +55395,7 @@
2020-11-18 Andrea Corallo <akrl@sdf.org>
Fix eln file hasing for symlink paths (bug#44701)
Fix eln file hashing for symlink paths (bug#44701)
* src/comp.c (Fcomp_el_to_eln_filename): Call `file-truename'
in place of `expand-file-name' when available.
@ -55928,7 +55928,7 @@
Fix debug symbol emission
* src/comp.c (Fcomp__compile_ctxt_to_file): Now that we do not
rely anymore on globlal variables move logic in from
rely anymore on global variables move logic in from
'Fcomp__init_ctxt' so comp.debug is already set correctly.
2020-11-14 Andrea Corallo <akrl@sdf.org>
@ -59251,7 +59251,7 @@
2020-10-26 Andrea Corallo <akrl@sdf.org>
Make native compiler tollerant to redefined primitives (bug#44221).
Make native compiler tolerant to redefined primitives (bug#44221).
* lisp/emacs-lisp/comp.el (comp-emit-set-call-subr): Rework based
on the fact that the subr can now be redefined.
@ -59833,7 +59833,7 @@
Fix error in tramp-sh-handle-make-process
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't use heredoc
script whent the argument contains a string.
script when the argument contains a string.
2020-10-23 Stefan Kangas <stefan@marxist.se>
@ -64846,7 +64846,7 @@
2020-09-24 Andrea Corallo <akrl@sdf.org>
Add a test for primitive advicing effectiveness
Add a test for primitive advising effectiveness
* test/src/comp-test-funcs.el (comp-test-primitive-advice-f): New
function.
@ -64903,7 +64903,7 @@
install a subr trampoline into the function relocation table.
Once this is done any call from native compiled Lisp to the
related primitive will go through the `funcall' trampoline
making advicing effective.
making advising effective.
2020-09-23 Andrea Corallo <akrl@sdf.org>
@ -70385,7 +70385,7 @@
(MD5_BLOCKSIZE): New macro.
(accumulate_and_process_md5, final_process_md5, md5_gz_stream)
(comp_hash_source_file): New functions.
(Fcomp_el_to_eln_filename): Rework for hasing using also source
(Fcomp_el_to_eln_filename): Rework for hashing using also source
file content.
* src/lread.c (maybe_swap_for_eln): Rename el_name -> src_name as
@ -73450,7 +73450,7 @@
2020-08-11 Paul Eggert <eggert@cs.ucla.edu>
pdumper speed tweeks for hash tables
pdumper speed tweaks for hash tables
* src/pdumper.c (dump_queue_empty_p): Avoid unnecessary call
to Fhash_table_count on a known hash table.
@ -77752,7 +77752,7 @@
2020-06-22 Andrea Corallo <akrl@sdf.org>
Handle correctly pure delaration specifier.
Handle correctly pure declaration specifier.
* lisp/emacs-lisp/comp.el (comp-func): New slot 'pure'.
(comp-spill-decl-spec): New function.
@ -81415,7 +81415,7 @@
2020-05-14 Andrea Corallo <akrl@sdf.org>
Dump log and intemediate GCC IRs only at comp-debug 3
Dump log and intermediate GCC IRs only at comp-debug 3
* src/comp.c (Fcomp__init_ctxt): Increase threshold for dumping
really everything to 'comp-debug' 3.
@ -84459,7 +84459,7 @@
either be encoding a string without NL, or decoding without CR.
* src/coding.c (string_ascii_p): Revert to a pure predicate.
(code_convert_string): Fix logic. Don't use uninitialised
(code_convert_string): Fix logic. Don't use uninitialized
ascii_p (removed). Use memchr to detect CR or LF in string when needed.
* test/src/coding-tests.el (coding-nocopy-ascii):
Update tests to include encodings with explicit EOL conversions.
@ -86579,7 +86579,7 @@
Merge remote-tracking branch 'savannah/master' into HEAD
* Fix regexp instroduced by f055f52321
* Fix regexp introduced by f055f52321
2020-03-09 Paul Eggert <eggert@cs.ucla.edu>
@ -86613,7 +86613,7 @@
* lisp/term/rxvt.el: Enable backeted paste and window title
rxvt-unicode uses the same escape sequences as xterm so just re-use
rxvt-unicode uses the same escape sequences as xterm so just reuse
the xterm functions to enable them. The `xterm-rxvt-function-map`
keymap already has
@ -94009,7 +94009,7 @@
Fix an error in tramp-sh-handle-make-process. Don't merge with master
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't use heredoc
script whent the argument contains a string.
script when the argument contains a string.
2021-02-03 Stefan Kangas <stefan@marxist.se>
@ -97511,7 +97511,7 @@
* lisp/subr.el (cancel-change-group): Fix bug#39680
Don't re-use an existing `pending-undo-list` even if (eq last-command 'undo)
Don't reuse an existing `pending-undo-list` even if (eq last-command 'undo)
since there might have been changes to the buffer since that `undo` command
and the `pending-undo-list` can hence be invalid for the current
buffer contents.
@ -110510,7 +110510,7 @@
2019-10-01 Lars Ingebrigtsen <larsi@gnus.org>
Make the help page mention the customizeable global mode variable
Make the help page mention the customizable global mode variable
* lisp/help-fns.el (help-fns--customize-variable): Factor out into
own function for reuse.
@ -117135,7 +117135,7 @@
Use timer-convert with t rather than doing it by hand.
* src/timefns.c (time_hz_ticks, time_form_stamp, lisp_time_form_stamp):
Remove; no longer needed.
(decode_lisp_time): Rturn the form instead of having a *PFORM arg.
(decode_lisp_time): Return the form instead of having a *PFORM arg.
All uses changed.
(time_arith): Just return TICKS if HZ is 1.
(Fencode_time): Remove argument FORM. All callers changed.
@ -131090,7 +131090,7 @@
Make shr-rescale-image respect get-buffer-window again
* lisp/net/shr.el (shr-rescale-image): Partially revert previous
change -- ressurrect the check for `get-buffer-window'.
change -- resurrect the check for `get-buffer-window'.
2019-05-16 Ivan Shmakov <ivan@siamics.net>
@ -135103,7 +135103,7 @@
(help-fns--var-ignored-local, help-fns--var-file-local)
(help-fns--var-watchpoints, help-fns--var-obsolete)
(help-fns--var-alias, help-fns--var-bufferlocal): New functions,
extacted from describe-variable.
extracted from describe-variable.
(describe-variable): Run help-fns-describe-variable-functions instead.
2019-04-12 Glenn Morris <rgm@gnu.org>
@ -163190,7 +163190,7 @@
Quieten eshell compilation
* lisp/eshell/em-tramp.el: Require esh-cmd.
* lisp/eshell/esh-ext.el: Requie esh-io at runtime too.
* lisp/eshell/esh-ext.el: Require esh-io at runtime too.
2018-02-28 Glenn Morris <rgm@gnu.org>
@ -164098,7 +164098,7 @@
(server-socket-dir): Compute socket dir from
`get-external-sockname'.
(server-start): Don't check for existing server when an
uninitialised external socket has been passed to Emacs.
uninitialized external socket has been passed to Emacs.
* src/emacs.c: (main): Obtain socket name via getsockname and pass
to `init_process_emacs'.
* src/lisp.h: (init_process_emacs): Add second parameter.
@ -165010,7 +165010,7 @@
Merge from origin/emacs-26
6415b2d Allow read-passwd to hide characters inserted by C-y. (Secur...
6415b2d Allow read-passwd to hide characters inserted by C-y. (Secure...
8cb4ffb * etc/PROBLEMS: Document issues with double-buffering. (Bug#...
fd10070 * lisp/window.el (window-largest-empty-rectangle): Fix grammar.
e1a4403 Minor changes in the Emacs manual
@ -165500,7 +165500,7 @@
1fc98ed073 ; Spelling fix
bb396a369c Update Org to v9.1.6
fa582153f7 Use text-pixels values only when saving framesets (Bug#30141)
6b01b9475d Minor improvement in section "Pages" of the usere manual
6b01b9475d Minor improvement in section "Pages" of the user manual
e8c8bd3de2 Minor improvements in user manual
26b8b92e63 Improve the "Mark" chapter of the user manual
759569fe40 Improve the "Buffers" chapter of the user manual
@ -167643,7 +167643,7 @@
2017-12-12 Glenn Morris <rgm@gnu.org>
Fix gitmerge handling of automatic conflict reslution
Fix gitmerge handling of automatic conflict resolution
* admin/gitmerge.el (gitmerge-resolve): Reenable NEWS handling.
(gitmerge-resolve-unmerged): Commit after successful resolution.
@ -172441,11 +172441,11 @@
* src/window.c (Fset_window_margins, Fset_window_fringes)
(Fset_window_scroll_bars): In doc-strings tell that a window
must be large enough to accommodate fringes, sroll bars and
must be large enough to accommodate fringes, scroll bars and
margins of the desired size.
* doc/lispref/display.texi (Fringe Size/Pos, Scroll Bars)
(Display Margins): Tell that windows must be large enough to
accommodate fringes, sroll bars and margins of the desired
accommodate fringes, scroll bars and margins of the desired
size.
2019-03-10 Eli Zaretskii <eliz@gnu.org>
@ -175963,7 +175963,7 @@
Save the server alias on reconnect (Bug#29657)
rcirc does not retain the server alias on reconnect. As a result, rcirc
fails to re-use server and channel buffers when an alias is used. Further
fails to reuse server and channel buffers when an alias is used. Further
problems may ensue when aliases are used to differentiate multiple
connections to the same host, for example when using a single IRC bouncer
or proxy to connect to multiple IRC networks.
@ -180914,7 +180914,7 @@
2018-01-21 Eli Zaretskii <eliz@gnu.org>
Minor improvement in section "Pages" of the usere manual
Minor improvement in section "Pages" of the user manual
* doc/emacs/text.texi (Pages): Improve wording. Suggested by Will
Korteland <emacs-devel@korte.land> in emacs-manual-bugs@gnu.org.
@ -184512,7 +184512,7 @@
* src/lisp.h (GCALIGNMENT): Change it back to a macro
that expands to a literal integer constant, for older GCC.
I had mistakenly thought that only MSVC had the problem.
Problem repored by Eli Zaretskii (Bug#29040#69).
Problem reported by Eli Zaretskii (Bug#29040#69).
2017-11-03 Paul Eggert <eggert@cs.ucla.edu>
@ -186856,7 +186856,7 @@
* doc/misc/flymake.texi (Overview of Flymake): Rewrite a bit.
(Installing Flymake): Mostly scratch. Flymake comes with Emacs.
(Running the syntax check): Simplify.
(Viewing error messages): Dekete,
(Viewing error messages): Delete.
(Syntax check statuses): Rewrite.
(Troubleshooting): Simplify.
(Customizable variables): Rewrite.
@ -188461,7 +188461,7 @@
Loosen strict parsing requirement for desktop files
There are other desktop-looking files, for instance those having to do
with MIME typess, that would benefit from being able to be read by this
with MIME types, that would benefit from being able to be read by this
function. It helps to have some flexibility.
* lisp/xdg.el (xdg-desktop-read-file): Remove an error condition.
* test/lisp/xdg-tests.el: Remove a test.
@ -219622,7 +219622,7 @@
for 0x80 ⪬ c < 0x100. In other words, the loop never executes for
c ≥ 0x80 and RE_CHAR_TO_MULTIBYTE call is unnecessary for c < 0x80.
* src/regex.c (regex_compile): Simplyfy a for loop by eliminating
* src/regex.c (regex_compile): Simplify a for loop by eliminating
dead iterations and unnecessary macro calls.
2016-09-08 Michal Nazarewicz <mina86@mina86.com>
@ -229115,7 +229115,7 @@
6da3a6d Port to strict C99 offsetof
de7601f Port to GTK with strict C11 compiler
658aa2d Port to GTK with strict C99 compiler
1df7173 Avoid screen artifacts with new OS X visible bell after scrol...
1df7173 Avoid screen artifacts with new OS X visible bell after scroll...
7a2edd3 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
dca240a Suppress some Tramp tests for OSX, do not merge with master
9094304 * lisp/progmodes/xref.el (xref-buffer-name, xref--window): Mo...
@ -233746,7 +233746,7 @@
ee73997 Make erc work better when encountering unknown prefix chars
b99141d Make erc completion case-insensitive again
66c4620 Make complection in erc use consistent casing
66c4620 Make completion in erc use consistent casing
8c562b2 Make /QUIT in erc more robust
d93d2c5 Make tracking faces in Emacs work more reliably
af6ab7e Make shr not bug out on images on non-graphical displays
@ -234944,7 +234944,7 @@
(rng-complete-attribute-value): Don't perform completion, but return
completion data instead.
(rng-complete-qname-function, rng-generate-qname-list): Add a few
arguments, previously passed via dynamic coping.
arguments, previously passed via dynamic copying.
(rng-strings-to-completion-table): Rename from
rng-strings-to-completion-alist. Don't return an alist. Don't both
sorting and uniquifying.
@ -235280,7 +235280,7 @@
d400753 * src/buffer.c: Stick with ASCII in doc string.
221240c Reword transient-mark-mode doc string
977d3ea Update doc string of 'selective-display'
229c3fa Make C++ buffers writeable when writing their initial text
229c3fa Make C++ buffers writable when writing their initial text
properties.
f5c762c Additional changes for "make check-expensive"
1729cf3 ; * admin/MAINTAINERS: Remove myself.

672
ChangeLog.4
View File

File diff suppressed because it is too large Load Diff

4
doc/emacs/ChangeLog.1
View File

@ -1294,7 +1294,7 @@
* display.texi (Visual Line Mode): Fix index entry.
* buffers.texi (Several Buffers): List Buffer Menu command anmes,
* buffers.texi (Several Buffers): List Buffer Menu command names,
and index the keybindings. Document tabulated-list-sort.
(Kill Buffer): Capitalize Buffer Menu.
@ -6443,7 +6443,7 @@
2007-01-01 Richard Stallman <rms@gnu.org>
* commands.texi (User Input): Document keys stolen by window mangers.
* commands.texi (User Input): Document keys stolen by window managers.
2006-12-31 Richard Stallman <rms@gnu.org>

2
doc/misc/ChangeLog.1
View File

@ -6011,7 +6011,7 @@
(RSS Feeds): New section.
(Built-in table editor): Document M-e and M-a navigate
inside table field.
(Stuck projects): Docment that projects identified as
(Stuck projects): Document that projects identified as
un-stuck will still be searched for stuck sub-projects.
(Paragraphs): Document centering.
(Creating timestamps, Agenda commands): Document new

2
doc/misc/modus-themes.org
View File

@ -5080,7 +5080,7 @@ each of the three channels of light (red, green, blue). For example:
: xrandr --output LVDS1 --brightness 1.0 --gamma 0.76:0.75:0.68
Typography is another variable. Some font families are blurry at small
point sizes. Others may have a regular weight that is lighter (thiner)
point sizes. Others may have a regular weight that is lighter (thinner)
than that of their peers which may, under certain circumstances, cause a
halo effect around each glyph.

2
lisp/ChangeLog.12
View File

@ -10678,7 +10678,7 @@
for root variables.
* progmodes/gdb-ui.el (gdb-pc-address): Rename from gdb-frame-address.
(gdb-frame-address): Re-use to identify frame for watch expression.
(gdb-frame-address): Reuse to identify frame for watch expression.
(gdb-var-list, gdb-var-create-handler): Add frame address for root
variables.
(gdb-init-1, gdb-source, gdb-post-prompt)

2
lisp/ChangeLog.13
View File

@ -12592,7 +12592,7 @@
* textmodes/org.el (org-agenda-skip): Allow a form for
`org-agenda-skip-function'.
(org-agenda-redo): Re-use local settings.
(org-agenda-redo): Reuse local settings.
(org-agenda): Store local settings.
(org-agenda-deadline-faces): New option.
(org-agenda-deadline-face): New function.

6
lisp/ChangeLog.14
View File

@ -16505,7 +16505,7 @@
(diary-list-entries-2): Simplify finding start of date.
(diary-show-all-entries, make-diary-entry): Respect non-nil values of
pop-up-frames.
(diary-mark-entries-1): Re-use offset in abbreviated-year case.
(diary-mark-entries-1): Reuse offset in abbreviated-year case.
(mark-sexp-diary-entries): Remove superfluous call to diary-pull-attrs.
2008-03-27 Dan Nicolaescu <dann@ics.uci.edu>
@ -17072,14 +17072,14 @@
* calendar/cal-bahai.el (calendar-bahai-leap-year-p)
(calendar-bahai-leap-base, calendar-bahai-from-absolute): Doc fixes.
(calendar-absolute-from-bahai): Fix the leap-year case.
(calendar-bahai-from-absolute): Re-use the Gregorian month.
(calendar-bahai-from-absolute): Reuse the Gregorian month.
(calendar-bahai-date-string, calendar-bahai-print-date):
Handle pre-Bahai dates.
* calendar/cal-china.el (chinese-calendar-celestial-stem)
(chinese-calendar-terrestrial-branch): Make defcustoms.
* calendar/cal-menu.el (calendar-mouse-holidays): Re-use the title.
* calendar/cal-menu.el (calendar-mouse-holidays): Reuse the title.
(calendar-mouse-view-diary-entries): Use or.
(calendar-mouse-chinese-date): Remove unused command.
(cal-menu-load-hook): Mark as obsolete.

2
lisp/ChangeLog.15
View File

@ -7702,7 +7702,7 @@
* finder.el: Load finder-inf using `require'.
(finder-list-matches): Sorting by status is now the default.
(finder-compile-keywords): Simpify printing.
(finder-compile-keywords): Simplify printing.
2010-08-30 Stefan Monnier <monnier@iro.umontreal.ca>

4
lisp/ChangeLog.16
View File

@ -1770,7 +1770,7 @@
(jit-lock--debug-fontifying): New var.
(jit-lock--debug-fontify): New function.
* subr.el (condition-case-unless-debug): Don't prevent catching the
error, just let the debbugger run.
error, just let the debugger run.
* emacs-lisp/timer.el (timer-event-handler): Don't prevent debugging
timer code and don't drop errors silently.
@ -4784,7 +4784,7 @@
Convert to defcustom.
(gdb-get-source-file): Don't bind pop-up-windows.
* progmodes/gud.el (gud-display-line): Don't specially re-use
* progmodes/gud.el (gud-display-line): Don't specially reuse
other frames for the gdb-mi case (Bug#12648).
2012-10-18 Stefan Monnier <monnier@iro.umontreal.ca>

2
lisp/ChangeLog.17
View File

@ -4339,7 +4339,7 @@
(verilog-beg-of-statement-1, verilog-at-constraint-p):
Fix hanging with many curly-bracket pairs, bug663.
(verilog-do-indent): Fix electric tab deleting form-feeds.
Note caused by indent-line-to deleting tabls pre 24.5.
Note caused by indent-line-to deleting tables pre 24.5.
(verilog-auto-output, verilog-auto-input, verilog-auto-inout)
(verilog-auto-inout-module, verilog-auto-inout-in): Doc fixes.
(verilog-read-always-signals, verilog-auto-sense-sigs)

2
lisp/ChangeLog.7
View File

@ -5232,7 +5232,7 @@
1998-03-29 Ralph Schleicher <rs@purple.UL.BaWue.DE>
* battery.el (battery-linux-proc-apm): Re-use the temporary
* battery.el (battery-linux-proc-apm): Reuse the temporary
buffer.
* battery.el (battery-insert-file-contents): Disable code

2
lisp/cedet/ChangeLog.1
View File

@ -1515,7 +1515,7 @@
* semantic/complete.el (semantic-complete-post-command-hook):
Exit completion when user has deleted all characters from the prefix.
(semantic-displayor-focus-request): Return to previous window when
focussing tags.
focusing tags.
* semantic/db-el.el (semanticdb-normalize-one-tag): Make obsolete.
(semanticdb-elisp-sym->tag): Use help-function-arglist instead.

4
lisp/gnus/ChangeLog.1
View File

@ -663,7 +663,7 @@
1998-08-07 Gareth Jones <gdj1@gdjones.demon.co.uk>
* gnus-score.el (gnus-summary-increase-score): Don't downcase
before lookin in char-to-header.
before looking in char-to-header.
1998-08-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
@ -2745,7 +2745,7 @@
1997-12-05 Dave Love <d.love@dl.ac.uk>
* gnus-nocem.el (gnus-nocem-message-wanted-p): Fix paren typpo.
* gnus-nocem.el (gnus-nocem-message-wanted-p): Fix paren typo.
(gnus-nocem-issuers): Allow sexp alternative in :type for alists.
1997-12-05 Dave Love <d.love@dl.ac.uk>

4
lisp/gnus/ChangeLog.2
View File

@ -6215,7 +6215,7 @@
* pop3.el (pop3-retr): Wait 500 msecs.
(pop3-read-response): Ditto.
* gnus-msg.el (gnus-setup-message): Get the evaliation order
* gnus-msg.el (gnus-setup-message): Get the evaluation order
right.
(gnus-inews-make-draft): New function.
(gnus-setup-message): Use it.
@ -9474,7 +9474,7 @@
2002-03-01 Paul Jarc <prj@po.cwru.edu>
* message.el (message-get-reply-headers): Downcase email addresses
for comaparisons for duplicate removal.
for comparisons for duplicate removal.
2002-03-01 ShengHuo ZHU <zsh@cs.rochester.edu>

4
lisp/gnus/ChangeLog.3
View File

@ -13,7 +13,7 @@
2015-04-01 Eric Abrahamsen <eric@ericabrahamsen.net>
* registry.el (registry-prune): Re-use `registry-full' in
* registry.el (registry-prune): Reuse `registry-full' in
`registry-prune'. It's a bit of redundant work, but safer.
Also ensure that target-size is an integer.
@ -78,7 +78,7 @@
* gnus-notifications.el (gnus-notifications-action): Raise window
frame.
(gnus-notifications-action): Allow mark as read.
(gnus-notifications-notify): Show uption to mark as read.
(gnus-notifications-notify): Show option to mark as read.
2015-03-08 Adam Sjøgren <asjo@koldfront.dk>

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

@ -7534,7 +7534,7 @@
(mh-yank-cur-msg): Add a space between sexprs.
* mh-utils.el (mh-mark-active-p): New macro which papers over
diffences between GNU Emacs and XEmacs. The variables mark-active
differences between GNU Emacs and XEmacs. The variables mark-active
and transient-mark-mode are used in GNU Emacs while zmacs-regions
and region-active-p are used in XEmacs.

2
lisp/mh-e/ChangeLog.2
View File

@ -2576,7 +2576,7 @@
use function mh-variants instead.
(mh-variant-info, mh-variant-mh-info, mh-variant-mu-mh-info)
(mh-variant-nmh-info): Co-locate next to mh-variants, which uses
them. Updated to use mh-file-command-p which is more accurrate
them. Updated to use mh-file-command-p which is more accurate
than file-executable-p which returns t for directories.
(mh-file-command-p): Move here from mh-utils, since
mh-variant-*-info are the only functions to use it.

16
lisp/org/ChangeLog.1
View File

@ -12523,7 +12523,7 @@
2012-01-03 Carsten Dominik <carsten.dominik@gmail.com> (tiny change)
* org-clock.el (org-clock-in, org-clock-find-position):
Remove erraneous space in regexp.
Remove erroneous space in regexp.
2012-01-03 Eric Schulte <eric.schulte@gmx.com>
@ -12700,7 +12700,7 @@
2012-01-03 Carsten Dominik <carsten.dominik@gmail.com> (tiny change)
* org-clock.el (org-clock-in, org-clock-find-position):
Remove erraneous space in regexp.
Remove erroneous space in regexp.
2012-01-03 Jambunathan K <kjambunathan@gmail.com>
@ -14573,7 +14573,7 @@
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
* org-footnote.el (org-footnote-at-definition-p): Re-use
* org-footnote.el (org-footnote-at-definition-p): Reuse
`org-footnote-definition-re'.
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
@ -18471,7 +18471,7 @@
* org-list.el (org-in-item-p): When point was just after
org-list-end-re, check wouldn't be done for starting line. So, if
the first line was an item, it wouln't be noticed and function
the first line was an item, it wouldn't be noticed and function
would return nil. Simplify and comment code.
2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com>
@ -19554,7 +19554,7 @@
2011-07-28 Julien Danjou <julien@danjou.info>
* org-agenda.el (org-format-agenda-item): Simplify time comuting.
* org-agenda.el (org-format-agenda-item): Simplify time computing.
2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com>
@ -22539,7 +22539,7 @@
2010-11-11 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-src-font-lock-fontify-block): Re-use hidden
* org-src.el (org-src-font-lock-fontify-block): Reuse hidden
language major mode buffers during fontification.
2010-11-11 Dan Davison <davison@stats.ox.ac.uk>
@ -26729,7 +26729,7 @@
2009-11-20 Eric Schulte <schulte.eric@gmail.com>
* org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
hash keys to cache and re-use images generated by the
hash keys to cache and reuse images generated by the
org-exp-blocks interface to ditaa and dot.
* org.el (org-format-latex): Latex images are now saved to files
@ -29300,7 +29300,7 @@
statistics.
(org-hierarchical-checkbox-statistics): New option.
* org.el (org-cycle): Remove erraneous space character.
* org.el (org-cycle): Remove erroneous space character.
* org-icalendar.el (org-icalendar-timezone): Initialize from
environment.

53
lisp/progmodes/c-ts-mode.el
View File

@ -322,7 +322,8 @@ PARENT and BOL are like other anchor functions."
(treesit-node-parent prev-sibling) t)))
;; If the start of the previous sibling isn't at the
;; beginning of a line, something's probably not quite
;; right, go a step further.
;; right, go a step further. (E.g., comment after a
;; statement.)
(_ (goto-char (treesit-node-start prev-sibling))
(if (looking-back (rx bol (* whitespace))
(line-beginning-position))
@ -356,27 +357,40 @@ PARENT, BOL, ARGS are the same as other anchor functions."
(apply (alist-get 'standalone-parent treesit-simple-indent-presets)
parent (treesit-node-parent parent) bol args))
(defun c-ts-mode--prev-line-match (regexp)
"An indentation matcher that matches if previous line matches REGEXP."
(lambda (_n _p bol &rest _)
(save-excursion
(goto-char bol)
(forward-line -1)
(back-to-indentation)
(looking-at-p regexp))))
(defun c-ts-mode--else-heuristic (node parent bol &rest _)
"Heuristic matcher for when \"else\" is followed by a closing bracket.
NODE, PARENT, and BOL are the same as in other matchers."
(and (null node)
(save-excursion
(forward-line -1)
(looking-at (rx (* whitespace) "else" (* whitespace) eol)))
(let ((next-node (treesit-node-first-child-for-pos parent bol)))
(equal (treesit-node-type next-node) "}"))))
(defun c-ts-mode--first-sibling (node parent &rest _)
"Matches when NODE is the \"first sibling\".
\"First sibling\" is defined as: the first child node of PARENT
such that it's on its own line. NODE is the node to match and
PARENT is its parent."
(let ((prev-sibling (treesit-node-prev-sibling node t)))
(or (null prev-sibling)
(save-excursion
(goto-char (treesit-node-start prev-sibling))
(<= (line-beginning-position)
(treesit-node-start parent)
(line-end-position))))))
(defun c-ts-mode--indent-styles (mode)
"Indent rules supported by `c-ts-mode'.
MODE is either `c' or `cpp'."
(let ((common
`((c-ts-mode--for-each-tail-body-matcher prev-line c-ts-mode-indent-offset)
;; If the user types "if (...)" and hits RET, they expect
;; point on the empty line to be indented; this rule
;; does that.
((and no-node
(c-ts-mode--prev-line-match
,(rx (or "if" "else" "while" "do" "for"))))
prev-line c-ts-mode-indent-offset)
;; If the user types "else" and hits RET, they expect point
;; on the empty line to be indented; this rule does that.
;; This heuristic is intentionally very specific because
;; more general heuristic is very error-prone, see
;; discussion in bug#67417.
(c-ts-mode--else-heuristic prev-line c-ts-mode-indent-offset)
((parent-is "translation_unit") column-0 0)
((query "(ERROR (ERROR)) @indent") column-0 0)
@ -458,7 +472,11 @@ MODE is either `c' or `cpp'."
((parent-is "field_declaration_list") c-ts-mode--anchor-prev-sibling 0)
;; Statement in {} blocks.
((or (match nil "compound_statement" nil 1 1)
((or (and (parent-is "compound_statement")
;; If the previous sibling(s) are not on their
;; own line, indent as if this node is the first
;; sibling (Bug#67357)
c-ts-mode--first-sibling)
(match null "compound_statement"))
standalone-parent c-ts-mode-indent-offset)
((parent-is "compound_statement") c-ts-mode--anchor-prev-sibling 0)
@ -471,6 +489,7 @@ MODE is either `c' or `cpp'."
((parent-is "if_statement") standalone-parent c-ts-mode-indent-offset)
((parent-is "else_clause") standalone-parent c-ts-mode-indent-offset)
((parent-is "for_statement") standalone-parent c-ts-mode-indent-offset)
((match "while" "do_statement") parent-bol 0) ; (do_statement "while")
((parent-is "while_statement") standalone-parent c-ts-mode-indent-offset)
((parent-is "do_statement") standalone-parent c-ts-mode-indent-offset)

2
lisp/progmodes/js.el
View File

@ -3497,7 +3497,7 @@ Check if a node type is available, then return the right indent rules."
:language 'javascript
:feature 'comment
'((comment) @font-lock-comment-face)
'([(comment) (hash_bang_line)] @font-lock-comment-face)
:language 'javascript
:feature 'constant

12
lisp/progmodes/ruby-mode.el
View File

@ -2125,7 +2125,7 @@ It will be properly highlighted even when the call omits parens.")
"or" "not" "&&" "||"))
;; Method name from the list.
"\\|\\_<"
(regexp-opt ruby-syntax-methods-before-regexp)
(regexp-opt ruby-syntax-methods-before-regexp t)
"\\)\\s *")
"Regexp to match text that can be followed by a regular expression."))
@ -2183,14 +2183,20 @@ It will be properly highlighted even when the call omits parens.")
(when (save-excursion
(forward-char -1)
(cl-evenp (skip-chars-backward "\\\\")))
(let ((state (save-excursion (syntax-ppss (match-beginning 1)))))
(let ((state (save-excursion (syntax-ppss (match-beginning 1))))
division-like)
(when (or
;; Beginning of a regexp.
(and (null (nth 8 state))
(save-excursion
(setq division-like
(or (eql (char-after) ?\s)
(not (eql (char-before (1- (point))) ?\s))))
(forward-char -1)
(looking-back ruby-syntax-before-regexp-re
(line-beginning-position))))
(line-beginning-position)))
(not (and division-like
(match-beginning 2))))
;; End of regexp. We don't match the whole
;; regexp at once because it can have
;; string interpolation inside, or span

2
lisp/progmodes/typescript-ts-mode.el
View File

@ -205,7 +205,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
(treesit-font-lock-rules
:language language
:feature 'comment
`((comment) @font-lock-comment-face)
`([(comment) (hash_bang_line)] @font-lock-comment-face)
:language language
:feature 'constant

6
src/ChangeLog.11
View File

@ -2029,7 +2029,7 @@
(update_frame_tool_bar): Calculate tool-bar style once per call.
Instead of hiding text labels, omit them. Don't use
xg_show_toolbar_item; create new GtkToolItems from scratch if
necessary, instead of trying to re-use them. This avoids an
necessary, instead of trying to reuse them. This avoids an
annoying animation when changing tool-bars.
2010-12-31 Jan Djärv <jan.h.d@swipnet.se>
@ -2048,7 +2048,7 @@
(ns_set_name): Call ns_set_name_internal.
(x_explicitly_set_name): Remove call to ns_set_name_iconic.
(x_implicitly_set_name): Ditto.
(x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal.
(x_set_title): Remove comment about EXPLICIT. Call ns_set_name_internal.
(ns_set_name_as_filename): Encode name with ENCODE_UTF_8 (Bug#7517).
2010-12-29 Štěpán Němec <stepnem@gmail.com> (tiny change)
@ -9435,7 +9435,7 @@
continuation line, and start looking for a suitable row from
there.
* term.c (append_glyph): Reverse glyphs by pre-pending them,
* term.c (append_glyph): Reverse glyphs by prepending them,
rather than appending, if the glyph_row's reversed_p flag is set.
Set the resolved_level and bidi_type members of each glyph.

6
src/ChangeLog.13
View File

@ -5464,7 +5464,7 @@
(set_horizontal_scroll_bar): New function.
(redisplay_window): Set ignore_mouse_drag_p when tool bar has
more than one line. Handle horizontal scroll bars.
(note_mouse_highlight): Handle horizontal scrol bars.
(note_mouse_highlight): Handle horizontal scroll bars.
(expose_frame): Set dimensions of XRectangle from frame's text
sizes.
(Vvoid_text_area_pointer): Update doc-string.
@ -8437,7 +8437,7 @@
* xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
* keyboard.c (Frecursive_edit): Say more precicely how throwing
* keyboard.c (Frecursive_edit): Say more precisely how throwing
`exit' works (bug#15865).
2014-02-07 Martin Rudalics <rudalics@gmx.at>
@ -16678,7 +16678,7 @@
2013-05-27 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
* xdisp.c (pos_visible_p): When CHARPOS is displayed from a
display vector, and we backtrack, handle the case that the
previous character position is also displayed from a display
vector or covered by a display string or image. (Bug#14476)

2
src/ChangeLog.8
View File

@ -10802,7 +10802,7 @@
(display_mode_element): Ditto.
(echo_area_display): Don't display if frame has no pools yet.
(echo_area_display): Work with window matrix for mini window.
(redisplay_window): Use window marix for mini window.
(redisplay_window): Use window matrix for mini window.
(display_text_line): Assume HPOS and VPOS are window relative and
use that for DISPLAY_STRING.

2
src/ChangeLog.9
View File

@ -11622,7 +11622,7 @@
(set_font_frame_param): If `font' is specified in lface, use it.
(Finternal_get_lisp_face_attribute): Handle `font' slot in lface.
(lface_same_font_attributes_p): Likewise.
(make_realized_face): Arguent changed. Caller changed. Set
(make_realized_face): Argument changed. Caller changed. Set
face->ascii_face to face itself.
(free_realized_face): Free face->fontset if face is for ASCII.
(face_suitable_for_iso8859_1_p, face_suitable_for_charset_p)

2
src/pgtkterm.c
View File

@ -6259,7 +6259,7 @@ symbol_to_drag_action (Lisp_Object act)
if (NILP (act))
return GDK_ACTION_DEFAULT;
signal_error ("Invalid drag acction", act);
signal_error ("Invalid drag action", act);
}
static Lisp_Object

48
test/lisp/progmodes/c-ts-mode-resources/indent.erts
View File

@ -330,7 +330,7 @@ label:
Name: Bracket-less Block-Statement (Linux Style) (bug#61026)
=-=-=
=-=
int main() {
while (true)
if (true) {
@ -351,6 +351,8 @@ int main() {
if (true) {
puts ("Hello");
}
else
puts("Hello");
}
=-=-=
@ -399,6 +401,34 @@ void foo(
}
=-=-=
Name: Block-Statement where first siblings are comments (Linux Style)
=-=
int main() {
while (true) { /* foo */
if (true) { // bar
puts ("Hello");
}
}
for (;;) { // 1. fooo
/* 2. baaa */
/* 3. rrr */
if (true)
// 2. baaa
puts ("Hello");
}
if (1) { // 1
/*
* 2
*/
if (1) /*3*/ {
/* 4 */
puts("Hello");
}
}
}
=-=-=
Name: Initializer List (Linux Style) (Bug#61398)
=-=
@ -498,3 +528,19 @@ main (void)
{
|
=-=-=
Code:
(lambda ()
(c-ts-mode)
(setq-local indent-tabs-mode nil)
(goto-line 3)
(indent-for-tab-command))
Name: Block-Statement where previous sibling is comment
=-=
int main() {
puts ("Hello"); // unusual indent and has trailing comment.
return true; // Should align with previous non-comment sibling (rather than one level up against parent).
}
=-=-=

12
test/lisp/progmodes/ruby-mode-tests.el
View File

@ -157,6 +157,18 @@ VALUES-PLIST is a list with alternating index and value elements."
(ert-deftest ruby-regexp-is-not-mistaken-for-slash-symbol ()
(ruby-assert-state "x = /foo:/" 3 nil))
(ert-deftest ruby-slash-not-regexp-when-surrounded-by-spaces ()
(ruby-assert-state "x = index / 3" 3 nil))
(ert-deftest ruby-slash-not-regexp-when-no-spaces ()
(ruby-assert-state "x = index/3" 3 nil))
(ert-deftest ruby-regexp-not-division-when-only-space-before ()
(ruby-assert-state "x = index /3" 3 ?/))
(ert-deftest ruby-slash-not-regexp-when-only-space-after ()
(ruby-assert-state "x = index/ 3" 3 nil))
(ert-deftest ruby-indent-simple ()
(ruby-should-indent-buffer
"if foo