From edb48646f273735534796c09d1943a2fc61750e5 Mon Sep 17 00:00:00 2001 From: Ikumi Keita Date: Tue, 31 May 2022 13:19:48 +0200 Subject: Fix Display Property manual example * doc/lispref/display.texi (Display Property): Fix syntax of example (bug#55736). Copyright-paperwork-exempt: yes --- doc/lispref/display.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 61aca5b88a6..1147ba112a6 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -4869,7 +4869,7 @@ which are evaluated at display time. This could be unsafe in certain situations, e.g., when the display specification was generated by some external program/agent. Wrapping a display specification in a list that begins with the special symbol @code{disable-eval}, as in -@w{@code{('disable-eval @var{spec})}}, will disable evaluation of any +@w{@code{(disable-eval @var{spec})}}, will disable evaluation of any Lisp in @var{spec}, while still supporting all the other display property features. -- cgit v1.2.1 From 5c74c2512378e1903ddc569987e2462108cc0acf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 31 May 2022 20:20:07 +0300 Subject: Remove from FAQ the MS-Windows info about BDF fonts * doc/misc/efaq.texi (How to add fonts): Remove the MS-Windows specific steps, as BDF fonts are no longer supported on MS-Windows. (Bug#55740) --- doc/misc/efaq.texi | 70 ------------------------------------------------------ 1 file changed, 70 deletions(-) diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index c1fd002bcb5..373efe9ad5f 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -4337,75 +4337,6 @@ add the following line to your @file{~/.emacs}: (setq ps-multibyte-buffer 'bdf-font-except-latin) @end lisp -A few additional steps are necessary for MS-Windows; they are listed -below. - -First, make sure @emph{all} the directories with BDF font files are -mentioned in @code{bdf-directory-list}. On Unix and GNU/Linux -systems, one normally runs @kbd{make install} to install the BDF fonts -in the same directory. By contrast, Windows users typically don't run -the Intlfonts installation command, but unpack the distribution in -some directory, which leaves the BDF fonts in its subdirectories. For -example, assume that you unpacked Intlfonts in @file{C:/Intlfonts}; -then you should set @code{bdf-directory-list} as follows: - -@lisp - (setq bdf-directory-list - '("C:/Intlfonts/Asian" - "C:/Intlfonts/Chinese" "C:/Intlfonts/Chinese.X" - "C:/Intlfonts/Chinese.BIG" "C:/Intlfonts/Ethiopic" - "C:/Intlfonts/European" "C:/Intlfonts/European.BIG" - "C:/Intlfonts/Japanese" "C:/Intlfonts/Japanese.X" - "C:/Intlfonts/Japanese.BIG" "C:/Intlfonts/Korean.X" - "C:/Intlfonts/Misc")) -@end lisp - -@cindex @code{w32-bdf-filename-alist} -@cindex @code{w32-find-bdf-fonts} -Next, you need to set up the variable @code{w32-bdf-filename-alist} to -an alist of the BDF fonts and their corresponding file names. -Assuming you have set @code{bdf-directory-list} to name all the -directories with the BDF font files, the following Lisp snippet will -set up @code{w32-bdf-filename-alist}: - -@lisp - (setq w32-bdf-filename-alist - (w32-find-bdf-fonts bdf-directory-list)) -@end lisp - -Now, create fontsets for the BDF fonts: - -@smallexample - (create-fontset-from-fontset-spec - "-*-fixed-medium-r-normal-*-16-*-*-*-c-*-fontset-bdf, - japanese-jisx0208:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1983-*, - katakana-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*, - latin-jisx0201:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0201*-*, - japanese-jisx0208-1978:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1978-*, - thai-tis620:-misc-fixed-medium-r-normal--16-160-72-72-m-80-tis620.2529-1, - lao:-misc-fixed-medium-r-normal--16-160-72-72-m-80-MuleLao-1, - tibetan-1-column:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-80-MuleTibetan-1, - ethiopic:-Admas-Ethiomx16f-Medium-R-Normal--16-150-100-100-M-160-Ethiopic-Unicode, - tibetan:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-160-MuleTibetan-0") -@end smallexample - -Many of the international bdf fonts from Intlfonts are type 0, and -therefore need to be added to font-encoding-alist: - -@lisp - (setq font-encoding-alist - (append '(("MuleTibetan-0" (tibetan . 0)) - ("GB2312" (chinese-gb2312 . 0)) - ("JISX0208" (japanese-jisx0208 . 0)) - ("JISX0212" (japanese-jisx0212 . 0)) - ("VISCII" (vietnamese-viscii-lower . 0)) - ("KSC5601" (korean-ksc5601 . 0)) - ("MuleArabic-0" (arabic-digit . 0)) - ("MuleArabic-1" (arabic-1-column . 0)) - ("MuleArabic-2" (arabic-2-column . 0))) - font-encoding-alist)) -@end lisp - You can now use the Emacs font menu to select the @samp{bdf: 16-dot medium} fontset, or you can select it by setting the default font in your @file{~/.emacs}: @@ -4414,7 +4345,6 @@ fontset, or you can select it by setting the default font in your (set-frame-font "fontset-bdf") @end lisp - @c ------------------------------------------------------------ @node Mail and news @chapter Mail and news -- cgit v1.2.1 From a95d46e00febf3ef4a7fd016e06d5c426e81f1e2 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 1 Jun 2022 17:56:45 +0200 Subject: Make it explicit that a couple of _s in lispref are underscores * doc/lispref/strings.texi (Custom Format Strings): * doc/lispref/control.texi (pcase Macro): Make it explicit that it's an underscore (bug#55742). --- doc/lispref/control.texi | 2 +- doc/lispref/strings.texi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index ecf616fc2be..34653d70565 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -525,7 +525,7 @@ core pattern can have the following forms: @table @code -@item _ +@item _@r{ (underscore)} Matches any @var{expval}. This is also known as @dfn{don't care} or @dfn{wildcard}. diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 3d8db985e9c..742ab76244d 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1345,7 +1345,7 @@ given width, if specified. This flag converts the substituted text to upper case (@pxref{Case Conversion}). -@item _ +@item _@r{ (underscore)} This flag converts the substituted text to lower case (@pxref{Case Conversion}). @end table -- cgit v1.2.1 From bfa647972f39e709c7a51981be3761224f0c1d48 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 1 Jun 2022 22:30:59 +0300 Subject: ; Fix doc string of 'delete-selection-repeat-replace-region' * lisp/delsel.el (delete-selection-repeat-replace-region): Doc fix. (Bug#55755) --- lisp/delsel.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/delsel.el b/lisp/delsel.el index f5fe7cf7939..554b1e7249a 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -108,7 +108,8 @@ the active region is killed instead of deleted." "Repeat replacing text of highlighted region with typed text. Search for the next stretch of text identical to the region last replaced by typing text over it and replaces it with the same stretch of text. -With ARG, repeat that many times. `\\[universal-argument]' means until end of buffer." +With ARG (interactively, prefix numeric argument), repeat that many times. +Just `\\[universal-argument]' means repeat until the end of the buffer's accessible portion." (interactive "P") (let ((old-text (and delete-selection-save-to-register (get-register delete-selection-save-to-register))) -- cgit v1.2.1 From ef5651cc77b9a57bd6af5f9914c26528355c80be Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 2 Jun 2022 13:41:59 +0300 Subject: Fix segfaults when starting on 80x26 TTY frames * src/dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Make sure we have valid frame glyph matrices for the interactive session. (Bug#55760) (adjust_frame_glyphs): Add assertions for when we fail to allocate valid frame glyph matrices for a TTY frame. --- src/dispnew.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/dispnew.c b/src/dispnew.c index 332ba54ee74..39e5469db05 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1837,7 +1837,18 @@ adjust_frame_glyphs (struct frame *f) if (FRAME_WINDOW_P (f)) adjust_frame_glyphs_for_window_redisplay (f); else - adjust_frame_glyphs_for_frame_redisplay (f); + { + adjust_frame_glyphs_for_frame_redisplay (f); + eassert (FRAME_INITIAL_P (f) + || noninteractive + || !initialized + || (f->current_matrix + && f->current_matrix->nrows > 0 + && f->current_matrix->rows + && f->desired_matrix + && f->desired_matrix->nrows > 0 + && f->desired_matrix->rows)); + } /* Don't forget the buffer for decode_mode_spec. */ adjust_decode_mode_spec_buffer (f); @@ -2119,6 +2130,19 @@ adjust_frame_glyphs_for_frame_redisplay (struct frame *f) SET_FRAME_GARBAGED (f); } } + else if (!FRAME_INITIAL_P (f) && !noninteractive && initialized) + { + if (!f->desired_matrix->nrows || !f->desired_matrix->rows) + { + adjust_glyph_matrix (NULL, f->desired_matrix, 0, 0, matrix_dim); + SET_FRAME_GARBAGED (f); + } + if (!f->current_matrix->nrows || !f->current_matrix->rows) + { + adjust_glyph_matrix (NULL, f->current_matrix, 0, 0, matrix_dim); + SET_FRAME_GARBAGED (f); + } + } } -- cgit v1.2.1 From 672f9f787fb34919b35d6fdb30f56083b8b7fb79 Mon Sep 17 00:00:00 2001 From: Ikumi Keita Date: Thu, 2 Jun 2022 14:29:38 +0200 Subject: Improve keystrokes in doc strings in some find-file functions * lisp/files.el (find-file): (find-file-other-window): (find-file-other-frame): Include the correct keymap so that keystrokes are displayed better (bug#55761). Copyright-paperwork-exempt: yes --- lisp/files.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index b187c0b3a0a..5e9dce555ff 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1706,7 +1706,7 @@ rather than FUN itself, to `minibuffer-setup-hook'." (defun find-file (filename &optional wildcards) "Edit file FILENAME. -Switch to a buffer visiting file FILENAME, +\\Switch to a buffer visiting file FILENAME, creating one if none already exists. Interactively, the default if you just type RET is the current directory, but the visited file name is available through the minibuffer history: @@ -1731,7 +1731,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp, expand wildcards (if any) and visit multiple files. You can suppress wildcard expansion by setting `find-file-wildcards' to nil. -To visit a file without any kind of conversion and without +\\To visit a file without any kind of conversion and without automatically choosing a major mode, use \\[find-file-literally]." (interactive (find-file-read-args "Find file: " @@ -1747,6 +1747,7 @@ automatically choosing a major mode, use \\[find-file-literally]." Like \\[find-file] (which see), but creates a new window or reuses an existing one. See the function `display-buffer'. +\\\ Interactively, the default if you just type RET is the current directory, but the visited file name is available through the minibuffer history: type \\[next-history-element] to pull it into the minibuffer. @@ -1779,6 +1780,7 @@ expand wildcards (if any) and visit multiple files." Like \\[find-file] (which see), but creates a new frame or reuses an existing one. See the function `display-buffer'. +\\\ Interactively, the default if you just type RET is the current directory, but the visited file name is available through the minibuffer history: type \\[next-history-element] to pull it into the minibuffer. -- cgit v1.2.1 From 284851265423e875d6de963922f3deb536aa2882 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 2 Jun 2022 16:04:38 +0300 Subject: ; * lisp/files.el (find-file): Avoid too short lines in doc string. --- lisp/files.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 5e9dce555ff..292c05b58e4 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1706,19 +1706,18 @@ rather than FUN itself, to `minibuffer-setup-hook'." (defun find-file (filename &optional wildcards) "Edit file FILENAME. -\\Switch to a buffer visiting file FILENAME, -creating one if none already exists. +\\Switch to a buffer visiting file FILENAME, creating one if none +already exists. Interactively, the default if you just type RET is the current directory, but the visited file name is available through the minibuffer history: type \\[next-history-element] to pull it into the minibuffer. -The first time \\[next-history-element] is used after Emacs prompts for -the file name, the result is affected by `file-name-at-point-functions', -which by default try to guess the file name by looking at point in the -current buffer. Customize the value of `file-name-at-point-functions' -or set it to nil, if you want only the visited file name and the -current directory to be available on first \\[next-history-element] -request. +The first time \\[next-history-element] is used after Emacs prompts for the file name, +the result is affected by `file-name-at-point-functions', which by +default try to guess the file name by looking at point in the current +buffer. Customize the value of `file-name-at-point-functions' or set +it to nil, if you want only the visited file name and the current +directory to be available on first \\[next-history-element] request. You can visit files on remote machines by specifying something like /ssh:SOME_REMOTE_MACHINE:FILE for the file name. You can -- cgit v1.2.1 From 92c5faafd7aac9b2382939fefd2cdf54f386a8e3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2022 10:06:43 +0300 Subject: Clarify documentation of 'string-to-unibyte' * doc/lispref/nonascii.texi (Converting Representations): Clarify what 'string-to-unibyte' does. Reported by Richard Hansen . (Bug#55777) --- doc/lispref/nonascii.texi | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index d7d25dc36af..6dc23637a79 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -280,11 +280,12 @@ to the codepoints @code{#x3FFF80} through @code{#x3FFFFF}, inclusive @defun string-to-unibyte string This function returns a unibyte string containing the same sequence of -characters as @var{string}. It signals an error if @var{string} -contains a non-@acronym{ASCII} character. If @var{string} is a -unibyte string, it is returned unchanged. Use this function for -@var{string} arguments that contain only @acronym{ASCII} and eight-bit -characters. +characters as @var{string}. If @var{string} is a unibyte string, it +is returned unchanged. Otherwise, @acronym{ASCII} characters and +characters in the @code{eight-bit} charset are converted to their +corresponding byte values. Use this function for @var{string} +arguments that contain only @acronym{ASCII} and eight-bit characters; +the function signals an error if any other characters are encountered. @end defun @defun byte-to-string byte -- cgit v1.2.1 From 1b8719835a200a2be17da226e82030f691caba80 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 4 Jun 2022 16:21:06 -0400 Subject: Update to Org 9.5.4 --- etc/refcards/orgcard.tex | 2 +- lisp/org/org-clock.el | 4 ++-- lisp/org/org-version.el | 4 ++-- lisp/org/org.el | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 2b4718805a6..bb4bc5b25df 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.5.3} +\def\orgversionnumber{9.5.4} \def\versionyear{2021} % latest update \input emacsver.tex diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index 895d124e146..081a6178345 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1106,7 +1106,7 @@ to be CLOCKED OUT.")))) 60)) (keep (or (and (memq ch '(?k ?K)) - (read-number "Keep how many minutes? " default)) + (read-number "Keep how many minutes: " default)) (and (memq ch '(?t ?T)) (floor (/ (float-time @@ -1114,7 +1114,7 @@ to be CLOCKED OUT.")))) 60))))) (gotback (and (memq ch '(?g ?G)) - (read-number "Got back how many minutes ago? " default))) + (read-number "Got back how many minutes ago: " default))) (subtractp (memq ch '(?s ?S))) (barely-started-p (org-time-less-p (org-time-subtract last-valid (cdr clock)) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 6bafb6fc378..6bdcb0afff5 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.5.3")) + (let ((org-release "9.5.4")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.5.3-6-gef41f3")) + (let ((org-git-version "release_9.5.4")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 6842bfe9b10..06af12339ec 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; Homepage: https://orgmode.org ;; Package-Requires: ((emacs "25.1")) -;; Version: 9.5.3 +;; Version: 9.5.4 ;; This file is part of GNU Emacs. ;; -- cgit v1.2.1