diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/international/latin1-disp.el | 21 | ||||
| -rw-r--r-- | lisp/org/ob-tangle.el | 2 | ||||
| -rw-r--r-- | lisp/org/ol-bibtex.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-agenda.el | 6 | ||||
| -rw-r--r-- | lisp/org/org-clock.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-compat.el | 6 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/replace.el | 9 |
8 files changed, 30 insertions, 20 deletions
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el index c8ff93aeb21..96a54cc2128 100644 --- a/lisp/international/latin1-disp.el +++ b/lisp/international/latin1-disp.el @@ -1,4 +1,4 @@ -;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*- lexical-binding: t; -*- +;;; latin1-disp.el --- display tables for non-ASCII on Latin-1 terminals -*- lexical-binding: t; -*- ;; Copyright (C) 2000-2022 Free Software Foundation, Inc. @@ -22,18 +22,23 @@ ;;; Commentary: -;; This package sets up display of ISO 8859-n for n>1 by substituting -;; Latin-1 characters and sequences of them for characters which can't -;; be displayed, either because we're on a tty or because we don't -;; have the relevant window system fonts available. For instance, -;; Latin-9 is very similar to Latin-1, so we can display most Latin-9 -;; characters using the Latin-1 characters at the same code point and -;; fall back on more-or-less mnemonic ASCII sequences for the rest. +;; This package sets up display of many non-ASCII characters by +;; substituting ASCII and Latin-1 characters and sequences of them for +;; characters which can't be displayed, either because we're on a tty +;; or because we don't have the relevant window system fonts +;; available. For instance, Latin-9 is very similar to Latin-1, so we +;; can display most Latin-9 characters using the Latin-1 characters at +;; the same code point and fall back on more-or-less mnemonic ASCII +;; sequences for the rest. ;; For the Latin charsets the ASCII sequences are mostly consistent ;; with the Quail prefix input sequences. Latin-4 uses the Quail ;; postfix sequences since a prefix method isn't defined for Latin-4. +;; Non-Latin non-ASCII characters are generally displayed as ASCII +;; strings remotely reminiscent of the original characters, as best as +;; possible. See `latin1-display-ucs-per-lynx'. + ;; [A different approach is taken in the DOS display tables in ;; term/internal.el, and the relevant ASCII sequences from there are ;; available as an alternative; see `latin1-display-mnemonic'. Only diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el index cf307aa0cb3..566258eba4a 100644 --- a/lisp/org/ob-tangle.el +++ b/lisp/org/ob-tangle.el @@ -43,7 +43,7 @@ (declare-function org-in-commented-heading-p "org" (&optional no-inheritance)) (declare-function org-in-archived-heading-p "org" (&optional no-inheritance)) (declare-function outline-previous-heading "outline" ()) -(defvar org-id-link-to-org-use-id nil) ; Dynamically scoped +(defvar org-id-link-to-org-use-id) ; Dynamically scoped (defcustom org-babel-tangle-lang-exts '(("emacs-lisp" . "el") diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el index 41443d79595..218f8f17ed5 100644 --- a/lisp/org/ol-bibtex.el +++ b/lisp/org/ol-bibtex.el @@ -115,7 +115,7 @@ (defvar org-agenda-overriding-header) (defvar org-agenda-search-view-always-boolean) -(defvar org-bibtex-description nil) ; dynamically scoped from org.el +(defvar org-bibtex-description nil) (defvar org-id-locations) (defvar org-property-end-re) (defvar org-special-properties) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 94aea1b0a32..ae0058e037e 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -99,8 +99,8 @@ ;; Defined somewhere in this file, but used before definition. (defvar org-agenda-buffer-name "*Org Agenda*") -(defvar org-agenda-overriding-header nil) (defvar org-agenda-title-append nil) +(defvar org-agenda-overriding-header) ;; (with-no-warnings (defvar entry)) ;; unprefixed, from calendar.el ;; (with-no-warnings (defvar date)) ;; unprefixed, from calendar.el (defvar original-date) ; dynamically scoped, calendar.el does scope this @@ -2158,7 +2158,7 @@ string that it returns." (org-remap org-agenda-mode-map 'move-end-of-line 'org-agenda-end-of-line) (defvar org-agenda-menu) ; defined later in this file. -(defvar org-agenda-restrict nil) ; defined later in this file. +(defvar org-agenda-restrict nil) (defvar org-agenda-follow-mode nil) (defvar org-agenda-entry-text-mode nil) (defvar org-agenda-clockreport-mode nil) @@ -7288,7 +7288,7 @@ When TYPE is \"scheduled\", \"deadline\", \"timestamp\" or \"timestamp_ia\", compare within each of these type. When TYPE is the empty string, compare all timestamps without respect of their type." - (let* ((def (and (not org-agenda-sort-notime-is-late) -1)) + (let* ((def (if org-agenda-sort-notime-is-late 99999999 -1)) (ta (or (and (string-match type (or (get-text-property 1 'type a) "")) (get-text-property 1 'ts-date a)) def)) diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index ddae182791e..dce5d9d4c0c 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -2505,7 +2505,7 @@ the currently selected interval size." (when step ;; Write many tables, in steps (unless (or block (and ts te)) - (user-error "Clocktable `:step' can only be used with `:block' or `:tstart, :end'")) + (user-error "Clocktable `:step' can only be used with `:block' or `:tstart', `:tend'")) (org-clocktable-steps params) (throw 'exit nil)) diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index cfccc2c0523..819ce74d93d 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -1048,9 +1048,9 @@ ELEMENT is the element at point." (cl-case (org-element-type object) ;; Prevent checks in links due to keybinding conflict with ;; Flyspell. - ((code entity export-snippet inline-babel-call - inline-src-block line-break latex-fragment link macro - statistics-cookie target timestamp verbatim) + ((citation citation-reference code entity export-snippet inline-babel-call + inline-src-block line-break latex-fragment link macro + statistics-cookie target timestamp verbatim) nil) (footnote-reference ;; Only in inline footnotes, within the definition. diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 5337d9df746..572203711c0 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (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.2-9-g7ba24c")) + (let ((org-git-version "release_9.5.2-13-gdd6486")) org-git-version)) (provide 'org-version) diff --git a/lisp/replace.el b/lisp/replace.el index dd6e5a42258..689a3f77ed3 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1413,10 +1413,15 @@ To return to ordinary Occur mode, use \\[occur-cease-edit]." (length s1))))) (prefix-len (funcall common-prefix buf-str text)) (suffix-len (funcall common-prefix - (reverse buf-str) (reverse text)))) + (reverse (substring + buf-str prefix-len)) + (reverse (substring + text prefix-len))))) (setq beg-pos (+ beg-pos prefix-len)) (setq end-pos (- end-pos suffix-len)) - (setq text (substring text prefix-len (- suffix-len))) + (setq text (substring text prefix-len + (and (not (zerop suffix-len)) + (- suffix-len)))) (delete-region beg-pos end-pos) (goto-char beg-pos) (insert text))) |