emacs/admin/notes, branch scratch/ns/performance Emacs is the extensible, customizable, self-documenting real-time display editor. Merge from origin/emacs-27 2020-08-31T17:45:54+00:00 Glenn Morris 2020-08-31T17:45:54+00:00 2f797124c303627a4543354eb18323e1e22e578e f20169399d (origin/emacs-27) Fix typo in Introduction to Emacs Lisp 7605060d51 Update Elisp Manual reference to which-function-mode 29708cbde7 Some precisions to bug handling dddc971f0e CC Mode: Fix processing for when c-multiline-string-start-... 4a73fb9668 Fix description of %-constructs in 'mode-line-format' 
f20169399d (origin/emacs-27) Fix typo in Introduction to Emacs Lisp
7605060d51 Update Elisp Manual reference to which-function-mode
29708cbde7 Some precisions to bug handling
dddc971f0e CC Mode: Fix processing for when c-multiline-string-start-...
4a73fb9668 Fix description of %-constructs in 'mode-line-format'
Some precisions to bug handling 2020-08-30T13:43:58+00:00 Michael Albinus 2020-08-30T13:43:58+00:00 29708cbde7afef52458950512e91a7904ed491c9 * admin/admin.el (reminder-for-release-blocking-bugs): Add date to subject. * admin/notes/bug-triage: * admin/notes/bugtracker: Minor precisions. 
* admin/admin.el (reminder-for-release-blocking-bugs): Add date to subject.

* admin/notes/bug-triage:
* admin/notes/bugtracker: Minor precisions.
; admin/notes/git-workflow 2020-05-03T17:21:21+00:00 Glenn Morris 2020-05-03T17:21:21+00:00 82c506192b5ae1a454dccfae2f41fa3ee6d5e990 Mention reverting on release branch. 
Mention reverting on release branch.
; admin/notes/git-workflow 2020-05-03T17:18:04+00:00 Glenn Morris 2020-05-03T17:18:04+00:00 97146efdc62914a99cce5a9bf4db4770c4aaa3ca Prefer "release branch" to a specific branch that can only ever get outdated. 
Prefer "release branch" to a specific branch that can only ever get outdated.
Merge from origin/emacs-27 2020-04-20T14:50:19+00:00 Glenn Morris 2020-04-20T14:50:19+00:00 477b9eaf45da1ebc4f2117d69df3571f0bf61e47 05089a4d65 (origin/emacs-27) Tweak wording re constant variables a1040861f1 Tweak setcar-related wording 751510f865 * lisp/image-mode.el: Add prefix key 's' and reduce depend... 9261a219ec * doc/emacs/windows.texi (Window Convenience): Decribe mor... e1d42da0d6 Fix mutability glitches reported by Drew Adams 5805df74f5 Improve mutability doc dca35b31d0 Improve mutability documentation 81e7d7f111 Document that quoting yields constants 5734339f40 * doc/lispref/keymaps.texi (Extended Menu Items, Easy Menu... 14a570afae Remove #' and function quoting from lambda forms in manual d5ec18c66b * src/regex-emacs.c (re_match_2_internal): Rework comment ... 4df8a61117 Add new node "Image Mode" to Emacs Manual. d7d5ee6c57 ; Fix a typo in cmdargs.texi (bug#40701) 5e9db48fbe * doc/lispref/display.texi (Customizing Bitmaps): Fix typo. eebfb72c90 Document constant vs mutable objects better 6c187ed6b0 Improve documentation of 'sort-lines' 52288f4b66 Mention 'spam-stat-process-directory-age' in the documenta... 067b070598 ; Fix some typos and doc issues (bug#40695) # Conflicts: # etc/NEWS 
05089a4d65 (origin/emacs-27) Tweak wording re constant variables
a1040861f1 Tweak setcar-related wording
751510f865 * lisp/image-mode.el: Add prefix key 's' and reduce depend...
9261a219ec * doc/emacs/windows.texi (Window Convenience): Decribe mor...
e1d42da0d6 Fix mutability glitches reported by Drew Adams
5805df74f5 Improve mutability doc
dca35b31d0 Improve mutability documentation
81e7d7f111 Document that quoting yields constants
5734339f40 * doc/lispref/keymaps.texi (Extended Menu Items, Easy Menu...
14a570afae Remove #' and function quoting from lambda forms in manual
d5ec18c66b * src/regex-emacs.c (re_match_2_internal): Rework comment ...
4df8a61117 Add new node "Image Mode" to Emacs Manual.
d7d5ee6c57 ; Fix a typo in cmdargs.texi (bug#40701)
5e9db48fbe * doc/lispref/display.texi (Customizing Bitmaps): Fix typo.
eebfb72c90 Document constant vs mutable objects better
6c187ed6b0 Improve documentation of 'sort-lines'
52288f4b66 Mention 'spam-stat-process-directory-age' in the documenta...
067b070598 ; Fix some typos and doc issues (bug#40695)

# Conflicts:
#	etc/NEWS
; Fix some typos and doc issues (bug#40695) 2020-04-18T15:10:02+00:00 Štěpán Němec 2020-03-01T17:50:14+00:00 067b0705986572e42687334c4eaf32988f22f680 






* admin/notes/font-backend: Remove outdated file. (Bug#34663)
2020-01-16T18:08:53+00:00

Stefan Kangas

2020-01-15T19:01:25+00:00

1b1aaf37dc745570ec5202c8cc596591f4afa38d

(cherry picked from commit 2be48605c0e31566401853a405dc7ea1892b3ef7)

; Not sure how the automatic merge managed to succeed with this conflict





(cherry picked from commit 2be48605c0e31566401853a405dc7ea1892b3ef7)

; Not sure how the automatic merge managed to succeed with this conflict







* admin/notes/font-backend: Remove outdated file. (Bug#34663)
2020-01-15T19:55:31+00:00

Stefan Kangas

2020-01-15T19:01:25+00:00

2be48605c0e31566401853a405dc7ea1892b3ef7












Remove unused ftx font backend driver
2020-01-15T18:57:27+00:00

Stefan Kangas

2020-01-15T18:57:27+00:00

576dfc8aa260957f4d0dc0c68cdcb8232a536f42

* src/ftxfont.c: Remove file.
* admin/notes/font-backend:
* configure.ac:
* src/Makefile.in:
* src/deps.mk (ftxfont.o):
* src/font.c (syms_of_font):
* src/font.h (top-level, font_property_index):
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Remove unused ftx
font backend driver.  Thanks to Glenn Morris for pointing out that it
can be removed.  (Bug#34663)





* src/ftxfont.c: Remove file.
* admin/notes/font-backend:
* configure.ac:
* src/Makefile.in:
* src/deps.mk (ftxfont.o):
* src/font.c (syms_of_font):
* src/font.h (top-level, font_property_index):
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Remove unused ftx
font backend driver.  Thanks to Glenn Morris for pointing out that it
can be removed.  (Bug#34663)







Go back to iso-2022-7bit for titdic-cnv.el again
2020-01-05T20:30:29+00:00

Paul Eggert

2020-01-05T20:29:05+00:00

3fc859d9550ff6d35dbb453eb75c3296f23a94cb

* admin/notes/unicode: Mention this.
* lisp/international/titdic-cnv.el:
Go back to iso-2022-7bit for this file, since utf-8-emacs unified
characters that tsanq-quick-converter did not want unified.
Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2020-01/msg00156.html





* admin/notes/unicode: Mention this.
* lisp/international/titdic-cnv.el:
Go back to iso-2022-7bit for this file, since utf-8-emacs unified
characters that tsanq-quick-converter did not want unified.
Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2020-01/msg00156.html