diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-03 15:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-09-03 15:32:54 -0700 |
| commit | 26bd978d87dfbf9baa115cd961a67d42b416c4bf (patch) | |
| tree | 20f3d063895796f54b9f521c0b35f65bbcd418c4 | |
| parent | 944d77f070da388b0c6e6578a9f868e88c088940 (diff) | |
| download | emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.tar.gz | |
Fix some more docstring etc. quoting problems
Mostly these fixes prevent the transliteration of apostrophes
that should stay apostrophes. Also, prefer curved quotes in
Bahá’í proper names, as that’s the preferred Bahá’í style and
these names are chock-full of non-ASCII characters anyway.
* lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload)
(eieio-defclass-internal):
* lisp/emacs-lisp/eieio.el (defclass):
* lisp/hi-lock.el (hi-lock-mode):
Don’t transliterate Lisp apostrophes when generating a
doc string or diagnostic.
* lisp/international/mule-diag.el (list-coding-systems-1):
* lisp/international/ogonek.el (ogonek-jak, ogonek-how):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer):
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map):
Substitute quotes before putting them in the help buffer.
108 files changed, 389 insertions, 382 deletions
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index f0a1cab0cb6..eb9085c9b0b 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -384,9 +384,9 @@ The structure includes the guides lines, bullet, and bullet cue.") Entries on the list are lists whose first element is a symbol indicating the change type and subsequent elements are data specific to that change -type. Specifically: +type. For example: - 'exposure `allout-exposure-from' `allout-exposure-to' `allout-exposure-flag' + (exposure ALLOUT-EXPOSURE-FROM ALLOUT-EXPOSURE-TO ALLOUT-EXPOSURE-FLAG) The changes are recorded in reverse order, with new values pushed onto the front.") diff --git a/lisp/calculator.el b/lisp/calculator.el index 49d47a0519b..80b7c070f1f 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el @@ -1551,7 +1551,7 @@ Used by `calculator-paste' and `get-register'." + - * / \\(div) %(rem) _(-X,postfix) ;(1/X,postfix) ^(exp) L(og) Q(sqrt) !(fact) S(in) C(os) T(an) |(or) #(xor) &(and) ~(not) * >/< repeats last binary operation with its 2nd (1st) arg as postfix op -* I inverses next trig function * '/\"/{} - display/display args +* I inverses next trig function * \\='/\"/{} - display/display args * D - switch to all-decimal, or toggle deg/rad mode * B/O/H/X - binary/octal/hex mode for i/o (X is a shortcut for H) * i/o - prefix for d/b/o/x - set only input/output modes diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el index b68ba8a866f..998dc6c7056 100644 --- a/lisp/calendar/cal-bahai.el +++ b/lisp/calendar/cal-bahai.el @@ -1,10 +1,10 @@ -;;; cal-bahai.el --- calendar functions for the Bahá'í calendar. +;;; cal-bahai.el --- calendar functions for the Bahá’í calendar. ;; Copyright (C) 2001-2015 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: calendar -;; Human-Keywords: Bahá'í calendar, Bahá'í, Baha'i, Bahai, calendar, diary +;; Human-Keywords: Bahá’í calendar, Bahá’í, Baha'i, Bahai, calendar, diary ;; Package: calendar ;; This file is part of GNU Emacs. @@ -25,9 +25,9 @@ ;;; Commentary: ;; This collection of functions implements the features of calendar.el -;; and diary-lib.el that deal with the Bahá'í calendar. +;; and diary-lib.el that deal with the Bahá’í calendar. -;; The Bahá'í (http://www.bahai.org) calendar system is based on a +;; The Bahá’í (http://www.bahai.org) calendar system is based on a ;; solar cycle of 19 months with 19 days each. The four remaining ;; "intercalary" days are called the Ayyám-i-Há (days of Há), and are ;; placed between the 18th and 19th months. They are meant as a time @@ -59,13 +59,13 @@ ["Bahá" "Jalál" "Jamál" "‘Aẓamat" "Núr" "Raḥmat" "Kalimát" "Kamál" "Asmá’" "‘Izzat" "Mashíyyat" "‘Ilm" "Qudrat" "Qawl" "Masá’il" "Sharaf" "Sulṭán" "Mulk" "‘Alá’"] - "Array of the month names in the Bahá'í calendar.") + "Array of the month names in the Bahá’í calendar.") (defconst calendar-bahai-epoch (calendar-absolute-from-gregorian '(3 21 1844)) - "Absolute date of start of Bahá'í calendar = March 21, 1844 AD.") + "Absolute date of start of Bahá’í calendar = March 21, 1844 AD.") (defun calendar-bahai-leap-year-p (year) - "True if Bahá'í YEAR is a leap year in the Bahá'í calendar." + "True if Bahá’í YEAR is a leap year in the Bahá’í calendar." (calendar-leap-year-p (+ year 1844))) (defconst calendar-bahai-leap-base @@ -74,7 +74,7 @@ Used by `calendar-bahai-to-absolute'.") (defun calendar-bahai-to-absolute (date) - "Compute absolute date from Bahá'í date DATE. + "Compute absolute date from Bahá’í date DATE. The absolute date is the number of days elapsed since the (imaginary) Gregorian date Sunday, December 31, 1 BC." (let* ((month (calendar-extract-month date)) @@ -95,9 +95,9 @@ Gregorian date Sunday, December 31, 1 BC." day))) ; days so far this month (defun calendar-bahai-from-absolute (date) - "Bahá'í date (month day year) corresponding to the absolute DATE." + "Bahá’í date (month day year) corresponding to the absolute DATE." (if (< date calendar-bahai-epoch) - (list 0 0 0) ; pre-Bahá'í date + (list 0 0 0) ; pre-Bahá’í date (let* ((greg (calendar-gregorian-from-absolute date)) (gmonth (calendar-extract-month greg)) (year (+ (- (calendar-extract-year greg) 1844) @@ -116,7 +116,7 @@ Gregorian date Sunday, December 31, 1 BC." ;;;###cal-autoload (defun calendar-bahai-date-string (&optional date) - "String of Bahá'í date of Gregorian DATE. + "String of Bahá’í date of Gregorian DATE. Defaults to today's date if DATE is not given." (let* ((bahai-date (calendar-bahai-from-absolute (calendar-absolute-from-gregorian @@ -142,19 +142,19 @@ Defaults to today's date if DATE is not given." ;;;###cal-autoload (defun calendar-bahai-print-date () - "Show the Bahá'í calendar equivalent of the selected date." + "Show the Bahá’í calendar equivalent of the selected date." (interactive) (let ((s (calendar-bahai-date-string (calendar-cursor-to-date t)))) (if (string-equal s "") - (message "Date is pre-Bahá'í") - (message "Bahá'í date: %s" s)))) + (message "Date is pre-Bahá’í") + (message "Bahá’í date: %s" s)))) (defun calendar-bahai-read-date () - "Interactively read the arguments for a Bahá'í date command. + "Interactively read the arguments for a Bahá’í date command. Reads a year, month and day." (let* ((today (calendar-current-date)) (year (calendar-read - "Bahá'í calendar year (not 0): " + "Bahá’í calendar year (not 0): " (lambda (x) (not (zerop x))) (number-to-string (calendar-extract-year @@ -163,19 +163,19 @@ Reads a year, month and day." (completion-ignore-case t) (month (cdr (assoc (completing-read - "Bahá'í calendar month name: " + "Bahá’í calendar month name: " (mapcar 'list (append calendar-bahai-month-name-array nil)) nil t) (calendar-make-alist calendar-bahai-month-name-array 1)))) - (day (calendar-read "Bahá'í calendar day (1-19): " + (day (calendar-read "Bahá’í calendar day (1-19): " (lambda (x) (and (< 0 x) (<= x 19)))))) (list (list month day year)))) ;;;###cal-autoload (defun calendar-bahai-goto-date (date &optional noecho) - "Move cursor to Bahá'í date DATE; echo Bahá'í date unless NOECHO is non-nil." + "Move cursor to Bahá’í date DATE; echo Bahá’í date unless NOECHO is non-nil." (interactive (calendar-bahai-read-date)) (calendar-goto-date (calendar-gregorian-from-absolute (calendar-bahai-to-absolute date))) @@ -186,8 +186,8 @@ Reads a year, month and day." ;;;###holiday-autoload (defun holiday-bahai (month day string) - "Holiday on MONTH, DAY (Bahá'í) called STRING. -If MONTH, DAY (Bahá'í) is visible in the current calendar window, + "Holiday on MONTH, DAY (Bahá’í) called STRING. +If MONTH, DAY (Bahá’í) is visible in the current calendar window, returns the corresponding Gregorian date in the form of the list (((month day year) STRING)). Otherwise, returns nil." ;; Since the calendar window shows 3 months at a time, there are @@ -199,7 +199,7 @@ list (((month day year) STRING)). Otherwise, returns nil." (m (calendar-extract-month bahai-date)) (y (calendar-extract-year bahai-date)) date) - (unless (< m 1) ; Bahá'í calendar doesn't apply + (unless (< m 1) ; Bahá’í calendar doesn't apply ;; Cf holiday-fixed, holiday-islamic. ;; With a +- 3 month calendar window, and 19 months per year, ;; month 16 is special. When m16 is central is when the @@ -209,7 +209,7 @@ list (((month day year) STRING)). Otherwise, returns nil." ;; To see if other months are visible we can shift the range ;; accordingly. (calendar-increment-month m y (- 16 month) 19) - (and (> m 12) ; Bahá'í date might be visible + (and (> m 12) ; Bahá’í date might be visible (calendar-date-is-visible-p (setq date (calendar-gregorian-from-absolute (calendar-bahai-to-absolute (list month day y))))) @@ -219,9 +219,9 @@ list (((month day year) STRING)). Otherwise, returns nil." ;;;###holiday-autoload (defun holiday-bahai-new-year () - "Holiday entry for the Bahá'í New Year, if visible in the calendar window." + "Holiday entry for the Bahá’í New Year, if visible in the calendar window." (holiday-fixed 3 21 - (format "Bahá'í New Year (Naw-Ruz) %d" + (format "Bahá’í New Year (Naw-Ruz) %d" (- displayed-year (1- 1844))))) ;;;###holiday-autoload @@ -246,12 +246,12 @@ Only considers the first, ninth, and twelfth days, unless ALL or ;;;###diary-autoload (defun diary-bahai-list-entries () - "Add any Bahá'í date entries from the diary file to `diary-entries-list'. -Bahá'í date diary entries must be prefaced by `diary-bahai-entry-symbol' + "Add any Bahá’í date entries from the diary file to `diary-entries-list'. +Bahá’í date diary entries must be prefaced by `diary-bahai-entry-symbol' \(normally a `B'). The same diary date forms govern the style of the -Bahá'í calendar entries, except that the Bahá'í month names cannot be -abbreviated. The Bahá'í months are numbered from 1 to 19 with Bahá being -1 and 19 being `Alá. If a Bahá'í date diary entry begins with +Bahá’í calendar entries, except that the Bahá’í month names cannot be +abbreviated. The Bahá’í months are numbered from 1 to 19 with Bahá being +1 and 19 being `Alá. If a Bahá’í date diary entry begins with `diary-nonmarking-symbol', the entry will appear in the diary listing, but will not be marked in the calendar. This function is provided for use with `diary-nongregorian-listing-hook'." @@ -263,7 +263,7 @@ will not be marked in the calendar. This function is provided for use with ;;;###diary-autoload (defun calendar-bahai-mark-date-pattern (month day year &optional color) - "Mark dates in calendar window that conform to Bahá'í date MONTH/DAY/YEAR. + "Mark dates in calendar window that conform to Bahá’í date MONTH/DAY/YEAR. A value of 0 in any position is a wildcard. Optional argument COLOR is passed to `calendar-mark-visible-date' as MARK." (calendar-mark-1 month day year 'calendar-bahai-from-absolute @@ -273,7 +273,7 @@ passed to `calendar-mark-visible-date' as MARK." ;;;###diary-autoload (defun diary-bahai-mark-entries () - "Mark days in the calendar window that have Bahá'í date diary entries. + "Mark days in the calendar window that have Bahá’í date diary entries. Marks each entry in `diary-file' (or included files) visible in the calendar window. See `diary-bahai-list-entries' for more information." (diary-mark-entries-1 'calendar-bahai-mark-date-pattern @@ -286,7 +286,7 @@ window. See `diary-bahai-list-entries' for more information." ;;;###cal-autoload (defun diary-bahai-insert-entry (arg) "Insert a diary entry. -For the Bahá'í date corresponding to the date indicated by point. +For the Bahá’í date corresponding to the date indicated by point. Prefix argument ARG makes the entry nonmarking." (interactive "P") (diary-insert-entry-1 nil arg calendar-bahai-month-name-array @@ -296,7 +296,7 @@ Prefix argument ARG makes the entry nonmarking." ;;;###cal-autoload (defun diary-bahai-insert-monthly-entry (arg) "Insert a monthly diary entry. -For the day of the Bahá'í month corresponding to the date indicated by point. +For the day of the Bahá’í month corresponding to the date indicated by point. Prefix argument ARG makes the entry nonmarking." (interactive "P") (diary-insert-entry-1 'monthly arg calendar-bahai-month-name-array @@ -306,7 +306,7 @@ Prefix argument ARG makes the entry nonmarking." ;;;###cal-autoload (defun diary-bahai-insert-yearly-entry (arg) "Insert an annual diary entry. -For the day of the Bahá'í year corresponding to the date indicated by point. +For the day of the Bahá’í year corresponding to the date indicated by point. Prefix argument ARG will make the entry nonmarking." (interactive "P") (diary-insert-entry-1 'yearly arg calendar-bahai-month-name-array @@ -318,8 +318,8 @@ Prefix argument ARG will make the entry nonmarking." ;; To be called from diary-list-sexp-entries, where DATE is bound. ;;;###diary-autoload (defun diary-bahai-date () - "Bahá'í calendar equivalent of date diary entry." - (format "Bahá'í date: %s" (calendar-bahai-date-string date))) + "Bahá’í calendar equivalent of date diary entry." + (format "Bahá’í date: %s" (calendar-bahai-date-string date))) (provide 'cal-bahai) diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el index 8a975d8e862..8bb1b88ee62 100644 --- a/lisp/calendar/cal-hebrew.el +++ b/lisp/calendar/cal-hebrew.el @@ -611,7 +611,7 @@ is provided for use with `diary-nongregorian-listing-hook'." "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR. A value of 0 in any position is a wildcard. Optional argument COLOR is passed to `calendar-mark-visible-date' as MARK." - ;; FIXME not the same as the Bahai and Islamic cases, so can't use + ;; FIXME not the same as the Bahá’í and Islamic cases, so can't use ;; calendar-mark-1. (with-current-buffer calendar-buffer (if (and (not (zerop month)) (not (zerop day))) diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index 7462df84566..251d811bc52 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -52,7 +52,7 @@ ["Insert Anniversary" diary-insert-anniversary-entry] ["Insert Block" diary-insert-block-entry] ["Insert Cyclic" diary-insert-cyclic-entry] - ("Insert Bahá'í" + ("Insert Bahá’í" ["One time" diary-bahai-insert-entry] ["Monthly" diary-bahai-insert-monthly-entry] ["Yearly" diary-bahai-insert-yearly-entry]) @@ -132,7 +132,7 @@ ["Astronomical Date" calendar-astro-goto-day-number] ["Hebrew Date" calendar-hebrew-goto-date] ["Persian Date" calendar-persian-goto-date] - ["Bahá'í Date" calendar-bahai-goto-date] + ["Bahá’í Date" calendar-bahai-goto-date] ["Islamic Date" calendar-islamic-goto-date] ["Julian Date" calendar-julian-goto-date] ["Chinese Date" calendar-chinese-goto-date] diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index e2e9182d626..e512faef15e 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -1602,7 +1602,7 @@ informative header, and run HOOK." (goto-char (point-min)) (when (search-forward "documentclass" nil t) (forward-line 1) - ;; Eg for some Bahai holidays. + ;; E.g., for some Bahá’í holidays. ;; FIXME latin1 might not always be right. (insert "\\usepackage[latin1]{inputenc}\n")))) (latex-mode) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 07977afc397..86e5477aa6f 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -42,7 +42,7 @@ ;; can be translated from the (usual) Gregorian calendar to the day of ;; the year/days remaining in year, to the ISO commercial calendar, to ;; the Julian (old style) calendar, to the Hebrew calendar, to the -;; Islamic calendar, to the Bahá'í calendar, to the French +;; Islamic calendar, to the Bahá’í calendar, to the French ;; Revolutionary calendar, to the Mayan calendar, to the Chinese ;; calendar, to the Coptic calendar, to the Ethiopic calendar, and to ;; the astronomical (Julian) day number. Times of sunrise/sunset can @@ -53,7 +53,7 @@ ;; The following files are part of the calendar/diary code: ;; appt.el Appointment notification -;; cal-bahai.el Bahá'í calendar +;; cal-bahai.el Bahá’í calendar ;; cal-china.el Chinese calendar ;; cal-coptic.el Coptic/Ethiopic calendars ;; cal-dst.el Daylight saving time rules @@ -375,7 +375,7 @@ When this expression is evaluated, DAY, MONTH, and YEAR are integers appropriate to the relevant date. For example, to display the ISO date: - (setq calendar-date-echo-text '(format \"ISO date: %s\" + (setq calendar-date-echo-text \\='(format \"ISO date: %s\" (calendar-iso-date-string (list month day year)))) Changing this variable without using customize has no effect on @@ -655,7 +655,7 @@ causes the diary entry \"Vacation\" to appear from November 1 through November 10, 1990. See the documentation for the function `diary-list-sexp-entries' for more details. -Diary entries based on the Hebrew, the Islamic and/or the Bahá'í +Diary entries based on the Hebrew, the Islamic and/or the Bahá’í calendar are also possible, but because these are somewhat slow, they are ignored unless you set the `diary-nongregorian-listing-hook' and the `diary-nongregorian-marking-hook' appropriately. See the @@ -690,7 +690,7 @@ details, see the documentation for the variable `diary-list-entries-hook'." :group 'diary) (defcustom diary-bahai-entry-symbol "B" - "Symbol indicating a diary entry according to the Bahá'í calendar." + "Symbol indicating a diary entry according to the Bahá’í calendar." :type 'string :group 'diary) @@ -1013,9 +1013,9 @@ calendar." :group 'holidays) (defcustom calendar-bahai-all-holidays-flag nil - "If nil, show only major holidays from the Bahá'í calendar. + "If nil, show only major holidays from the Bahá’í calendar. These are the days on which work and school must be suspended. -Otherwise, show all the holidays that would appear in a complete Bahá'í +Otherwise, show all the holidays that would appear in a complete Bahá’í calendar." :type 'boolean :group 'holidays) @@ -1708,13 +1708,13 @@ remaining in the year, and the ISO week/year numbers: (list \"\" - '(calendar-hebrew-date-string date) - '(let* ((year (calendar-extract-year date)) + \\='(calendar-hebrew-date-string date) + \\='(let* ((year (calendar-extract-year date)) (d (calendar-day-number date)) (days-remaining (- (calendar-day-number (list 12 31 year)) d))) (format \"%d/%d\" d days-remaining)) - '(let* ((d (calendar-absolute-from-gregorian date)) + \\='(let* ((d (calendar-absolute-from-gregorian date)) (iso-date (calendar-iso-from-absolute d))) (format \"ISO week %d of %d\" (calendar-extract-month iso-date) @@ -2571,7 +2571,7 @@ DATE is (month day year). Calendars that do not apply are omitted." (unless (string-equal (setq odate (calendar-bahai-date-string date)) "") - (format "Bahá'í date: %s" odate)) + (format "Bahá’í date: %s" odate)) (format "Chinese date: %s" (calendar-chinese-date-string date)) (unless (string-equal diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index b21fc687144..be542d6a155 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -300,7 +300,7 @@ expressions that can involve the keywords `days' (a number), `date' (defcustom diary-abbreviated-year-flag t "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD. -This applies to the Gregorian, Hebrew, Islamic, and Bahá'í calendars. +This applies to the Gregorian, Hebrew, Islamic, and Bahá’í calendars. When the current century is added to a two-digit year, if the result is more than 50 years in the future, the previous century is assumed. If the result is more than 50 years in the past, the next century is assumed. @@ -1531,7 +1531,7 @@ passed to `calendar-mark-visible-date' as MARK." (calendar-mark-month m y month day year color) (calendar-increment-month m y 1))))) -;; Bahai, Hebrew, Islamic. +;; Bahá’í, Hebrew, Islamic. (defun calendar-mark-complex (month day year fromabs &optional color) "Mark dates in the calendar conforming to MONTH DAY YEAR of some system. The function FROMABS converts absolute dates to the appropriate date system. @@ -1561,7 +1561,7 @@ Optional argument COLOR is passed to `calendar-mark-visible-date' as MARK." (calendar-mark-visible-date (calendar-gregorian-from-absolute date) color))))) -;; Bahai, Islamic. +;; Bahá’í, Islamic. (defun calendar-mark-1 (month day year fromabs toabs &optional color) "Mark dates in the calendar conforming to MONTH DAY YEAR of some system. The function FROMABS converts absolute dates to the appropriate date system. @@ -1659,8 +1659,8 @@ on a weekend: &%%(let ((dayname (calendar-day-of-week date)) (day (calendar-extract-day date))) (or - (and (= day 21) (memq dayname '(1 2 3 4 5))) - (and (memq day '(19 20)) (= dayname 5))) + (and (= day 21) (memq dayname \\='(1 2 3 4 5))) + (and (memq day \\='(19 20)) (= dayname 5))) ) UIUC pay checks deposited A number of built-in functions are available for this type of diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index d282d74392a..bd3a558dc2c 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -173,15 +173,15 @@ See the documentation for `calendar-holidays' for details." '((holiday-bahai-new-year) (holiday-bahai-ridvan) ; respects calendar-bahai-all-holidays-flag (holiday-fixed 5 23 "Declaration of the Báb") - (holiday-fixed 5 29 "Ascension of Bahá'u'lláh") + (holiday-fixed 5 29 "Ascension of Bahá’u’lláh") (holiday-fixed 7 9 "Martyrdom of the Báb") (holiday-fixed 10 20 "Birth of the Báb") - (holiday-fixed 11 12 "Birth of Bahá'u'lláh") + (holiday-fixed 11 12 "Birth of Bahá’u’lláh") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") - (holiday-fixed 11 28 "Ascension of `Abdu'l-Bahá"))))) - "Bahá'í holidays. + (holiday-fixed 11 28 "Ascension of `Abdu’l-Bahá"))))) + "Bahá’í holidays. See the documentation for `calendar-holidays' for details." :type 'sexp :group 'holidays) @@ -254,7 +254,7 @@ Several basic functions are provided for this purpose: K>0, and MONTH's last day otherwise. (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar - (holiday-bahai MONTH DAY STRING) a fixed date on the Bahá'í calendar + (holiday-bahai MONTH DAY STRING) a fixed date on the Bahá’í calendar (holiday-julian MONTH DAY STRING) a fixed date on the Julian calendar (holiday-sexp SEXP STRING) SEXP is a Gregorian-date-valued expression in the variable `year'; if it evaluates to @@ -282,11 +282,11 @@ To add the Islamic feast celebrating Mohammed's birthday, use (holiday-islamic 3 12 \"Mohammed's Birthday\") since the Islamic months are numbered from 1 starting with Muharram. -To add an entry for the Bahá'í festival of Ridvan, use +To add an entry for the Bahá’í festival of Ridvan, use (holiday-bahai 2 13 \"Festival of Ridvan\") -since the Bahá'í months are numbered from 1 starting with Bahá. +since the Bahá’í months are numbered from 1 starting with Bahá. To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use (holiday-julian 4 2 \"Jefferson's Birthday\") @@ -296,7 +296,7 @@ example, to include American presidential elections, which occur on the first Tuesday after the first Monday in November of years divisible by 4, add (holiday-sexp - '(if (zerop (% year 4)) + \\='(if (zerop (% year 4)) (calendar-gregorian-from-absolute (1+ (calendar-dayname-on-or-before 1 (+ 6 (calendar-absolute-from-gregorian @@ -460,7 +460,7 @@ The optional LABEL is used to label the buffer created." (if holiday-islamic-holidays (cons "Islamic" holiday-islamic-holidays)) (if holiday-bahai-holidays - (cons "Bahá'í" holiday-bahai-holidays)) + (cons "Bahá’í" holiday-bahai-holidays)) (if holiday-oriental-holidays (cons "Oriental" holiday-oriental-holidays)) (if holiday-solar-holidays diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index 51459fa7e74..b4fea421447 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -239,9 +239,9 @@ type is required and the load function used.") "Add PROJAUTO, an EDE autoload definition to `ede-project-class-files'. Optional argument FLAG indicates how this autoload should be added. Possible values are: - 'generic - A generic project type. Keep this at the very end. - 'unique - A unique project type for a specific project. Keep at the very - front of the list so more generic projects don't get priority." + `generic' - A generic project type. Keep this at the very end. + `unique' - A unique project type for a specific project. Keep at the very + front of the list so more generic projects don't get priority." ;; First, can we identify PROJAUTO as already in the list? If so, replace. (let ((projlist ede-project-class-files) (projname (oref projauto name))) diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 8409b73e719..9d07b67e894 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -230,8 +230,8 @@ string. INCOMPATIBLE-VERSION can be nil. RESERVED arguments are kept for a later use. Return: - nil if everything is ok. -- 'outdated if VERSION is less than MINIMUM. -- 'incompatible if VERSION is not backward compatible with MINIMUM. +- `outdated' if VERSION is less than MINIMUM. +- `incompatible' if VERSION is not backward compatible with MINIMUM. - t if the check failed." (let ((code (if (stringp version) (inversion-decode-version version) diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index 72512c6e6bc..3192684fbd7 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -50,7 +50,7 @@ (require 'find-func) ;; For find-function-regexp-alist. It is tempting to replace this -;; ‘require‘ by (defvar find-function-regexp-alist) and +;; ‘require’ by (defvar find-function-regexp-alist) and ;; with-eval-after-load, but model-local.el is typically loaded when a ;; semantic autoload is invoked, and something in semantic loads ;; find-func.el before mode-local.el, so the eval-after-load is lost. diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index 7ff69771023..fe888f57767 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -251,7 +251,7 @@ are found in SEQUENCE. Optional argument THROWSYM specifies a symbol the throw on non-recoverable error. Remaining arguments FLAGS are additional flags to apply when searching. This function knows of flags: - 'mustbeclassvariable" + `mustbeclassvariable'" (let ((s sequence) ; copy of the sequence (tmp nil) ; tmp find variable (tag nil) ; tag return list @@ -263,7 +263,7 @@ This function knows of flags: ) ;; First order check. Is this wholly contained in the typecache? (setq tmp (semanticdb-typecache-find sequence)) - + (when tmp (if (or (not tagclass) (semantic-tag-of-class-p tmp tagclass)) ;; We are effectively done... @@ -709,7 +709,7 @@ Returns nil if no alias was found." (when (eq (semantic-tag-get-attribute (car taglist) :kind) 'alias) (let ((tagname (semantic-analyze-split-name - (semantic-tag-name + (semantic-tag-name (car (semantic-tag-get-attribute (car taglist) :members)))))) (append (if (listp tagname) tagname diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el index c47b57336c5..680a0ae65bd 100644 --- a/lisp/cedet/semantic/analyze/complete.el +++ b/lisp/cedet/semantic/analyze/complete.el @@ -112,9 +112,9 @@ in a buffer." Argument CONTEXT is an object specifying the locally derived context. The optional argument FLAGS changes which return options are returned. FLAGS can be any number of: - 'no-tc - do not apply data-type constraint. - 'no-longprefix - ignore long multi-symbol prefixes. - 'no-unique - do not apply unique by name filtering." + `no-tc' - do not apply data-type constraint. + `no-longprefix' - ignore long multi-symbol prefixes. + `no-unique' - do not apply unique by name filtering." (let* ((a context) (desired-type (semantic-analyze-type-constraint a)) (desired-class (oref a prefixclass)) diff --git a/lisp/cedet/semantic/bovine/gcc.el b/lisp/cedet/semantic/bovine/gcc.el index fe7a14451f5..1d3f7730f35 100644 --- a/lisp/cedet/semantic/bovine/gcc.el +++ b/lisp/cedet/semantic/bovine/gcc.el @@ -137,9 +137,9 @@ to give to the program." "The GCC setup data. This is setup by `semantic-gcc-setup'. This is an alist, and should include keys of: - 'version - the version of gcc - '--host - the host symbol (used in include directories) - '--prefix - where GCC was installed. + `version' - the version of gcc + `--host' - the host symbol (used in include directories) + `--prefix' - where GCC was installed. It should also include other symbols GCC was compiled with.") ;;;###autoload diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index ff3431a17cf..293f535d60b 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -297,7 +297,7 @@ refreshed when things change. See `semanticdb-ref-test'. Note for overloading: If you opt to overload this function for your major mode, and your routine takes a long time, be sure to call - (semantic-throw-on-input 'your-symbol-here) + (semantic-throw-on-input \\='your-symbol-here) so that it can be called from the idle work handler." ) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 962dc49da54..1974e0ade07 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -540,7 +540,7 @@ For C/C++ includes located within a project, you can use a special EDE project that will wrap an existing build system. You can do that like this in your .emacs file: - (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN) + (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn \\='MYFCN) See the CEDET manual, the EDE manual, or the commentary in ede/cpp-root.el for more. diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index 0e81b2c0ba5..d8ba6f275f3 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -173,10 +173,10 @@ recover the cached data with `semantic-get-cache-data'. LIFESPAN indicates how long the data cache will be remembered. The default LIFESPAN is 'end-of-command. Possible Lifespans are: - 'end-of-command - Remove the cache at the end of the currently - executing command. - 'exit-cache-zone - Remove when point leaves the overlay at the - end of the currently executing command." + `end-of-command' - Remove the cache at the end of the currently + executing command. + `exit-cache-zone' - Remove when point leaves the overlay at the + end of the currently executing command." ;; Check if LIFESPAN is valid before to create any overlay (or lifespan (setq lifespan 'end-of-command)) (or (memq lifespan '(end-of-command exit-cache-zone)) diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 40eafd9f160..fe4440b1e1a 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -271,11 +271,11 @@ search locally, then semanticdb for that tag (when enabled.)") (define-overloadable-function semantic-tag-protection (tag &optional parent) "Return protection information about TAG with optional PARENT. This function returns on of the following symbols: - nil - No special protection. Language dependent. - 'public - Anyone can access this TAG. - 'private - Only methods in the local scope can access TAG. - 'protected - Like private for outside scopes, like public for child - classes. + nil - No special protection. Language dependent. + `public' - Anyone can access this TAG. + `private' - Only methods in the local scope can access TAG. + `protected' - Like private for outside scopes, like public for child + classes. Some languages may choose to provide additional return symbols specific to themselves. Use of this function should allow for this. diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el index b2a18fb48b8..a676a8b4591 100644 --- a/lisp/cedet/semantic/wisent/javascript.el +++ b/lisp/cedet/semantic/wisent/javascript.el @@ -73,11 +73,11 @@ This function overrides `get-local-variables'." (define-mode-local-override semantic-tag-protection javascript-mode (tag &optional parent) "Return protection information about TAG with optional PARENT. This function returns on of the following symbols: - nil - No special protection. Language dependent. - 'public - Anyone can access this TAG. - 'private - Only methods in the local scope can access TAG. - 'protected - Like private for outside scopes, like public for child - classes. + nil - No special protection. Language dependent. + `public' - Anyone can access this TAG. + `private' - Only methods in the local scope can access TAG. + `protected' - Like private for outside scopes, like public for child + classes. Some languages may choose to provide additional return symbols specific to themselves. Use of this function should allow for this. @@ -114,7 +114,7 @@ This is currently needed for the mozrepl omniscient database." (setq symlist (list (match-string 1 tmp) (substring tmp (1+ (match-end 1)) (length tmp)))) (setq symlist (list tmp)))))))) - + ;;; Setup Function ;; ;; Since javascript-mode is an alias for js-mode, let it inherit all diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index d1b00157648..2ff3060ac51 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -45,9 +45,9 @@ Only the ASK style inserter will query the user for a value. Dictionary value references that ask begin with the ? character. Possible values are: - 'ask - Prompt in the minibuffer as the value is inserted. - 'field - Use the dictionary macro name as the inserted value, - and place a field there. Matched fields change together. + `ask' - Prompt in the minibuffer as the value is inserted. + `field' - Use the dictionary macro name as the inserted value, + and place a field there. Matched fields change together. NOTE: The field feature does not yet work with XEmacs." :group 'srecode diff --git a/lisp/comint.el b/lisp/comint.el index b840a22bc84..ead2757e6e8 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2850,7 +2850,7 @@ then the filename reader will only accept a file that exists. A typical use: (interactive (comint-get-source \"Compile file: \" prev-lisp-dir/file - '(lisp-mode) t))" + \\='(lisp-mode) t))" (let* ((def (comint-source-default prev-dir/file source-modes)) (stringfile (comint-extract-string)) (sfile-p (and stringfile diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 08c1acdae86..aa26ac38fc5 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -477,7 +477,7 @@ (defun custom-split-regexp-maybe (regexp) "If REGEXP is a string, split it to a list at `\\|'. You can get the original back from the result with: - (mapconcat 'identity result \"\\|\") + (mapconcat \\='identity result \"\\|\") IF REGEXP is not a string, return it unchanged." (if (stringp regexp) diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 4903b152fac..b580a08a19a 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -687,8 +687,8 @@ to put saved Dired buffers automatically into Virtual Dired mode. Also useful for `auto-mode-alist' like this: - (add-to-list 'auto-mode-alist - '(\"[^/]\\\\.dired\\\\'\" . dired-virtual-mode))" + (add-to-list \\='auto-mode-alist + \\='(\"[^/]\\\\.dired\\\\\\='\" . dired-virtual-mode))" (interactive) (dired-virtual (dired-virtual-guess-dir))) diff --git a/lisp/dired.el b/lisp/dired.el index 206de373ade..eee703baa2b 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -91,7 +91,7 @@ spaces. You might want to install ls from GNU Coreutils, which does support this option. Alternatively, you might want to use Emacs's own emulation of \"ls\", by using: (setq ls-lisp-use-insert-directory-program nil) - (require 'ls-lisp) + (require \\='ls-lisp) This is used by default on MS Windows, which does not have an \"ls\" program. Note that `ls-lisp' does not support as many options as GNU ls, though. For more details, see Info node `(emacs)ls in Lisp'." diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el index 3b07c5dec4b..c47f7f943a2 100644 --- a/lisp/emacs-lisp/eieio-core.el +++ b/lisp/emacs-lisp/eieio-core.el @@ -219,7 +219,8 @@ It creates an autoload function for CNAME's constructor." ;; turn this into a usable self-pointing symbol (when eieio-backward-compatibility (set cname cname) - (make-obsolete-variable cname (format "use '%s instead" cname) "25.1")) + (make-obsolete-variable cname (format "use \\='%s instead" cname) + "25.1")) ;; Store the new class vector definition into the symbol. We need to ;; do this first so that we can call defmethod for the accessor. @@ -338,7 +339,8 @@ See `defclass' for more information." ;; turn this into a usable self-pointing symbol; FIXME: Why? (when eieio-backward-compatibility (set cname cname) - (make-obsolete-variable cname (format "use '%s instead" cname) "25.1")) + (make-obsolete-variable cname (format "use \\='%s instead" cname) + "25.1")) ;; Create a handy list of the class test too (when eieio-backward-compatibility @@ -357,8 +359,9 @@ See `defclass' for more information." (object-of-class-p (car obj) ,cname))) (setq obj (cdr obj))) ans)))) - (make-obsolete csym (format "use (cl-typep ... '(list-of %s)) instead" - cname) + (make-obsolete csym (format + "use (cl-typep ... \\='(list-of %s)) instead" + cname) "25.1"))) ;; Before adding new slots, let's add all the methods and classes @@ -407,7 +410,7 @@ See `defclass' for more information." (progn (set initarg initarg) (make-obsolete-variable - initarg (format "use '%s instead" initarg) "25.1")))) + initarg (format "use \\='%s instead" initarg) "25.1")))) ;; The customgroup should be a list of symbols. (cond ((and (null customg) custom) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index ad178c3a2c2..23203003d07 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -235,7 +235,8 @@ This method is obsolete." (let ((f (intern (format "%s-child-p" name)))) `((defalias ',f ',testsym2) (make-obsolete - ',f ,(format "use (cl-typep ... '%s) instead" name) "25.1")))) + ',f ,(format "use (cl-typep ... \\='%s) instead" name) + "25.1")))) ;; When using typep, (typep OBJ 'myclass) returns t for objects which ;; are subclasses of myclass. For our predicates, however, it is diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 7c4f21f603b..d4a2f029988 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -234,7 +234,7 @@ of it available such that: This variable has three possible values: nil: no packages are hidden; - archive: only criteria (a) is used; + `archive': only criteria (a) is used; t: both criteria are used. This variable has no effect if `package-menu--hide-packages' is diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index b0fb23dbcc9..9888e920219 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -92,7 +92,7 @@ is enclosed by at least one regexp grouping construct. The returned regexp is typically more efficient than the equivalent regexp: (let ((open (if PAREN \"\\\\(\" \"\")) (close (if PAREN \"\\\\)\" \"\"))) - (concat open (mapconcat 'regexp-quote STRINGS \"\\\\|\") close)) + (concat open (mapconcat \\='regexp-quote STRINGS \"\\\\|\") close)) If PAREN is `words', then the resulting regexp is additionally surrounded by \\=\\< and \\>. diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 250c292d72e..272556d3bae 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -502,7 +502,7 @@ ALIST is of the form ((key . func) (key . func) ...) Normally, this would be called from a hook to a major mode or on a per buffer basis. Usage: - (viper-add-local-keys state '((key-str . func) (key-str . func)...)) " + (viper-add-local-keys state \\='((key-str . func) (key-str . func)...)) " (let (map) (cond ((eq state 'vi-state) diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index eec69256db6..958c5ef8b62 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -1100,12 +1100,12 @@ Would expand to: add things to `erc-server-311-functions' instead.\" (do-stuff-with-whois proc parsed)) - (puthash \"311\" 'erc-server-311-functions erc-server-responses) - (puthash \"WHOIS\" 'erc-server-WHOIS-functions erc-server-responses) - (puthash \"WI\" 'erc-server-WI-functions erc-server-responses) + (puthash \"311\" \\='erc-server-311-functions erc-server-responses) + (puthash \"WHOIS\" \\='erc-server-WHOIS-functions erc-server-responses) + (puthash \"WI\" \\='erc-server-WI-functions erc-server-responses) - (defalias 'erc-server-WHOIS 'erc-server-311) - (defvar erc-server-WHOIS-functions 'erc-server-311 + (defalias \\='erc-server-WHOIS \\='erc-server-311) + (defvar erc-server-WHOIS-functions \\='erc-server-311 \"Some non-generic variable documentation. Hook called upon receiving a WHOIS server response. @@ -1116,8 +1116,8 @@ Would expand to: See also `erc-server-311'.\") - (defalias 'erc-server-WI 'erc-server-311) - (defvar erc-server-WI-functions 'erc-server-311 + (defalias \\='erc-server-WI \\='erc-server-311) + (defvar erc-server-WI-functions \\='erc-server-311 \"Some non-generic variable documentation. Hook called upon receiving a WI server response. diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 726e9ed9a21..b051645fe9b 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5203,7 +5203,7 @@ So far the following TYPE/L pairs are supported: Event TYPE L - nickname change 'nick (NEW-NICK)" + nickname change `nick' (NEW-NICK)" (erc-log (format "user-change: type: %S nlh: %S l: %S" type nlh l)) (cond ;; nickname change diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 539080f35c4..9b67175ea63 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -172,18 +172,18 @@ PERMISSION BITS (for owner/group/world): OWNERSHIP: U owned by effective uid - u(UID|'user') owned by UID/user - g(GID|'group') owned by GID/group + u(UID|\\='user\\=') owned by UID/user + g(GID|\\='group\\=') owned by GID/group FILE ATTRIBUTES: l[+-]N +/-/= N links - a[Mwhms][+-](N|'FILE') access time +/-/= N months/weeks/hours/mins/secs + a[Mwhms][+-](N|\\='FILE\\=') access time +/-/= N months/weeks/hours/mins/secs (days if unspecified) if FILE specified, - use as comparison basis; so a+'file.c' + use as comparison basis; so a+\\='file.c\\=' shows files accessed before file.c was last accessed - m[Mwhms][+-](N|'FILE') modification time... - c[Mwhms][+-](N|'FILE') change time... + m[Mwhms][+-](N|\\='FILE\\=') modification time... + c[Mwhms][+-](N|\\='FILE\\=') change time... L[kmp][+-]N file size +/-/= N Kb/Mb/blocks EXAMPLES: diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 170779fc5cd..2565842706e 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -88,7 +88,7 @@ specification of filenames (for example, in calling `find-file', or some other Lisp function that deals with files, not numbers), add the following in your init file: - (put 'find-file 'eshell-no-numeric-conversions t) + (put \\='find-file \\='eshell-no-numeric-conversions t) Any function with the property `eshell-no-numeric-conversions' set to a non-nil value, will be passed strings, not numbers, even when an diff --git a/lisp/ffap.el b/lisp/ffap.el index 975f7269192..8d3f8bfc37d 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -412,9 +412,9 @@ Optional SERVICE specifies the port used (default \"discard\"). Optional QUIET flag suppresses the \"Pinging...\" message. Optional STRATEGY overrides the three variables above. Returned values: - t means that HOST answered. -'accept means the relevant variable told us to accept. -\"mesg\" means HOST exists, but does not respond for some reason." + t means that HOST answered. +`accept' means the relevant variable told us to accept. +\"mesg\" means HOST exists, but does not respond for some reason." ;; Try some (Emory local): ;; (ffap-machine-p "ftp" nil nil 'ping) ;; (ffap-machine-p "nonesuch" nil nil 'ping) diff --git a/lisp/filesets.el b/lisp/filesets.el index c098879d49d..887d1383a69 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -679,14 +679,14 @@ variables my-ps-viewer, my-pdf-viewer, my-dvi-viewer, my-pic-viewer. In order to view pdf or rtf files in an Emacs buffer, you could use these: - \(\"^.+\\\\.pdf\\\\'\" \"pdftotext\" + \(\"^.+\\\\.pdf\\\\\\='\" \"pdftotext\" \((:capture-output t) \(:args (\"%S - | fmt -w \" window-width)) \(:ignore-on-read-text t) \(:constraintp (lambda () \(and \(filesets-which-command-p \"pdftotext\") \(filesets-which-command-p \"fmt\")))))) - \(\"^.+\\\\.rtf\\\\'\" \"rtf2htm\" + \(\"^.+\\\\.rtf\\\\\\='\" \"rtf2htm\" \((:capture-output t) \(:args (\"%S 2> /dev/null | w3m -dump -T text/html\")) \(:ignore-on-read-text t) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index b74b60341bd..8e8c6eb3845 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -538,12 +538,13 @@ and what they do: dollar-sign character. Hash characters in other contexts will still follow whatever the syntax table says about the hash character. - (\"\\\\('\\\\).\\\\('\\\\)\" + (\"\\\\(\\='\\\\).\\\\(\\='\\\\)\" (1 \"\\\"\") (2 \"\\\"\")) - gives a pair single-quotes, which surround a single character, a SYNTAX of - \"\\\"\" (meaning string quote syntax). Single-quote characters in other + gives a pair of apostrophes, which surround a single character, a + SYNTAX of \"\\\"\" (meaning string quote syntax). Apostrophes in other + contexts will not be affected. This is normally set via `font-lock-defaults'.") diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 325623139fe..ab22ab8b88a 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -328,7 +328,7 @@ compatibility with versions of Emacs that lack the variable (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) (image-load-path (cons (car load-path) - (when (boundp 'image-load-path) + (when (boundp \\='image-load-path) image-load-path)))) (mh-tool-bar-folder-buttons-init))" (unless library (error "No library specified")) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 01eb6c5cd48..8ad81c9fc3e 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -195,16 +195,16 @@ this list." "Headers that are only to be displayed if they have interesting data. Possible values in this list are: - 'empty Headers with no content. - 'newsgroups Newsgroup identical to Gnus group. - 'to-address To identical to To-address. - 'to-list To identical to To-list. - 'cc-list CC identical to To-list. - 'followup-to Followup-to identical to Newsgroups. - 'reply-to Reply-to identical to From. - 'date Date less than four days old. - 'long-to To and/or Cc longer than 1024 characters. - 'many-to Multiple To and/or Cc." + `empty' Headers with no content. + `newsgroups' Newsgroup identical to Gnus group. + `to-address' To identical to To-address. + `to-list' To identical to To-list. + `cc-list' CC identical to To-list. + `followup-to' Followup-to identical to Newsgroups. + `reply-to' Reply-to identical to From. + `date' Date less than four days old. + `long-to' To and/or Cc longer than 1024 characters. + `many-to' Multiple To and/or Cc." :type '(set (const :tag "Headers with no content." empty) (const :tag "Newsgroups identical to Gnus group." newsgroups) (const :tag "To identical to To-address." to-address) @@ -661,7 +661,7 @@ For instance, if you would like to save articles related to Gnus in the file \"gnus-stuff\", and articles related to VM in \"vm-stuff\", you could set this variable to something like: - '((\"^Subject:.*gnus\\|^Newsgroups:.*gnus\" \"gnus-stuff\") + ((\"^Subject:.*gnus\\|^Newsgroups:.*gnus\" \"gnus-stuff\") (\"^Subject:.*vm\\|^Xref:.*vm\" \"vm-stuff\")) This variable is an alist where the key is the match and the diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el index b233ad71868..23c79cbdb15 100644 --- a/lisp/gnus/gnus-registry.el +++ b/lisp/gnus/gnus-registry.el @@ -194,17 +194,17 @@ are tracked this way by default." "The splitting strategy applied to the keys in `gnus-registry-track-extra'. Given a set of unique found groups G and counts for each element -of G, and a key K (typically 'sender or 'subject): +of G, and a key K (typically `sender' or `subject'): When nil, if G has only one element, use it. Otherwise give up. This is the fastest but also least useful strategy. -When 'majority, use the majority by count. So if there is a +When `majority', use the majority by count. So if there is a group with the most articles counted by K, use that. Ties are resolved in no particular order, simply the first one found wins. This is the slowest strategy but also the most accurate one. -When 'first, the first element of G wins. This is fast and +When `first', the first element of G wins. This is fast and should be OK if your senders and subjects don't \"bleed\" across groups." :group 'gnus-registry diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 82a2c987dbb..e267b6ae30c 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -122,9 +122,10 @@ This variable can be a list of select methods which Gnus will query with the `ask-server' method in addition to the primary, secondary, and archive servers. + E.g.: (setq gnus-check-new-newsgroups - '((nntp \"some.server\") (nntp \"other.server\"))) + \\='((nntp \"some.server\") (nntp \"other.server\"))) If this variable is nil, then you have to tell Gnus explicitly to check for new newsgroups with \\<gnus-group-mode-map>\\[gnus-find-new-newsgroups]." diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 6b90204beb6..d4ca6555b66 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -997,7 +997,7 @@ following hook: (mail-header-set-subject header (gnus-simplify-subject - (mail-header-subject header) 're-only))) + (mail-header-subject header) \\='re-only))) gnus-newsgroup-headers)))" :group 'gnus-group-select :type 'hook) diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 881ff4ee1ba..f2164665529 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -143,7 +143,7 @@ details." To use, for instance, `untar' to unpack tar files and `zip -x' to unpack zip files, say the following: (setq gnus-uu-user-archive-rules - '((\"\\\\.tar$\" \"untar\") + \\='((\"\\\\.tar$\" \"untar\") (\"\\\\.zip$\" \"zip -x\")))" :group 'gnus-extract-archive :type '(repeat (group regexp (string :tag "Command")))) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 6362d9a951b..ea26216faca 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -1362,7 +1362,7 @@ If you want to save your mail in one group and the news articles you write in another group, you could say something like: \(setq gnus-message-archive-group - '((if (message-news-p) + \\='((if (message-news-p) \"misc-news\" \"misc-mail\"))) @@ -2396,7 +2396,7 @@ less space and be faster as a result. This variable can also be a list of visual elements to switch on. For instance, to switch off all visual things except menus, you can say: - (setq gnus-visual '(menu)) + (setq gnus-visual \\='(menu)) Valid elements include `summary-highlight', `group-highlight', `article-highlight', `mouse-face', `summary-menu', `group-menu', diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 0f6f63ea37d..5ede15b0538 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1131,7 +1131,7 @@ Presets to impersonate popular mail agents are found in the message-cite-style-* variables. This variable is intended for use in `gnus-posting-styles', such as: - ((posting-from-work-p) (eval (set (make-local-variable 'message-cite-style) message-cite-style-outlook)))" + ((posting-from-work-p) (eval (set (make-local-variable \\='message-cite-style) message-cite-style-outlook)))" :version "24.1" :group 'message-insertion :type '(choice (const :tag "Do not override variables" :value nil) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 15ccc4725d7..9784f1bd879 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -350,10 +350,10 @@ result, `gnus-retrieve-headers' will be called instead." (defcustom nnir-swish++-additional-switches '() "*A list of strings, to be given as additional arguments to swish++. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-swish++-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-swish++-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-swish++-additional-switches \\='(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) @@ -399,10 +399,10 @@ This cannot be a server parameter." (defcustom nnir-swish-e-additional-switches '() "*A list of strings, to be given as additional arguments to swish-e. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-swish-e-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-swish-e-additional-switches '(\"-i\" \"-w\")) + (setq nnir-swish-e-additional-switches \\='(\"-i\" \"-w\")) This could be a server parameter." :type '(repeat (string)) @@ -429,10 +429,10 @@ This could be a server parameter." (defcustom nnir-hyrex-additional-switches '() "*A list of strings, to be given as additional arguments for nnir-search. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-hyrex-additional-switches \"-ddl ddl.xml -c nnir\") ; wrong ! Instead, use this: - (setq nnir-hyrex-additional-switches '(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" + (setq nnir-hyrex-additional-switches \\='(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" :type '(repeat (string)) :group 'nnir) @@ -471,10 +471,10 @@ arrive at the correct group name, \"mail.misc\"." The switches `-q', `-a', and `-s' are always used, very few other switches make any sense in this context. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-namazu-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-namazu-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-namazu-additional-switches \\='(\"-i\" \"-w\"))" :type '(repeat (string)) :group 'nnir) @@ -500,10 +500,10 @@ arrive at the correct group name, \"mail.misc\"." (defcustom nnir-notmuch-additional-switches '() "*A list of strings, to be given as additional arguments to notmuch. -Note that this should be a list. Ie, do NOT use the following: +Note that this should be a list. I.e., do NOT use the following: (setq nnir-notmuch-additional-switches \"-i -w\") ; wrong Instead, use this: - (setq nnir-notmuch-additional-switches '(\"-i\" \"-w\"))" + (setq nnir-notmuch-additional-switches \\='(\"-i\" \"-w\"))" :version "24.1" :type '(repeat (string)) :group 'nnir) diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 681116017ba..7efb1543815 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -83,7 +83,7 @@ If you'd like, for instance, one mail group for mail from the else, you could do something like this: (setq nnmail-split-methods - '((\"mail.4ad\" \"From:.*4ad\") + \\='((\"mail.4ad\" \"From:.*4ad\") (\"mail.junk\" \"From:.*Lars\\\\|Subject:.*buy\") (\"mail.misc\" \"\"))) @@ -180,7 +180,7 @@ E.g.: (lambda (newsgroup) (cond ((string-match \"private\" newsgroup) 31) ((string-match \"junk\" newsgroup) 1) - ((string-match \"important\" newsgroup) 'never) + ((string-match \"important\" newsgroup) \\='never) (t 7))))" :group 'nnmail-expire :type '(choice (const :tag "nnmail-expiry-wait" nil) diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 8d09781cd79..6c97cecdcdb 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -72,7 +72,7 @@ For instance, if you want Gnus to beep every time you connect to innd, you could say something like: \(setq nntp-server-action-alist - '((\"innd\" (ding)))) + \\='((\"innd\" (ding)))) You probably don't want to do that, though.") diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 0255585f532..89b1204ad11 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -362,7 +362,7 @@ Hi-lock: end is found. A mode is excluded if it's in the list (setq hi-lock-archaic-interface-message-used t) (if hi-lock-archaic-interface-deduce (global-hi-lock-mode hi-lock-mode) - (warn + (warn "%s" "Possible archaic use of (hi-lock-mode). Use (global-hi-lock-mode 1) in .emacs to enable hi-lock for all buffers, use (hi-lock-mode 1) for individual buffers. For compatibility with Emacs diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 310a074adb1..24160a68066 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -133,10 +133,10 @@ main-content <=MAIN_CONTENT;\\n\" rtfm-section file style rtfm-section file)) \(defun rtfm-build-source-docs (section srcdir destdir) (interactive \"s section[eg- emacs / p4-blame]:\\nD source-dir: \\nD output-dir: \") - (require 'htmlfontify) + (require \\='htmlfontify) (hfy-load-tags-cache srcdir) - (let ((hfy-page-header 'rtfm-build-page-header) - (hfy-page-footer 'rtfm-build-page-footer) + (let ((hfy-page-header \\='rtfm-build-page-header) + (hfy-page-footer \\='rtfm-build-page-footer) (rtfm-section section) (hfy-index-file \"index\")) (htmlfontify-run-etags srcdir) diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 57b6d62e4aa..028c9916faf 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -770,7 +770,7 @@ but still contains full information about each coding system." # MNEMONIC-LETTER -- CODING-SYSTEM-NAME # DOC-STRING ") - (princ "\ + (princ (substitute-command-keys "\ ######################### ## LIST OF CODING SYSTEMS ## Each line corresponds to one coding system @@ -794,7 +794,7 @@ but still contains full information about each coding system." ## 0 ## POST-READ-CONVERSION, PRE-WRITE-CONVERSION = function name to be called ## -")) +"))) (dolist (coding-system (sort-coding-systems (coding-system-list 'base-only))) (if (null arg) (print-coding-system-briefly coding-system 'tightly) diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index 7caa5d4b30c..01cbe1e5222 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -133,10 +133,10 @@ znak/ow diakrytycznych. Funkcje te mo/zna pogrupowa/c nast/epuj/aco. `~/.emacs' za/z/ada/c wczytania wybranych funkcji, na dodatek dopiero w chwili ich rzeczywistego u/zycia: - (autoload 'ogonek-jak \"ogonek\") - (autoload 'ogonek-recode-region \"ogonek\") - (autoload 'ogonek-prefixify-region \"ogonek\") - (autoload 'ogonek-deprefixify-region \"ogonek\") + (autoload \\='ogonek-jak \"ogonek\") + (autoload \\='ogonek-recode-region \"ogonek\") + (autoload \\='ogonek-prefixify-region \"ogonek\") + (autoload \\='ogonek-deprefixify-region \"ogonek\") Cz/esto wyst/epuj/ace kombinacje wywo/la/n funkcji mo/zna dla wygody skr/oci/c i przypisa/c klawiszom. Oto praktyczne przyk/lady: @@ -144,17 +144,17 @@ znak/ow diakrytycznych. Funkcje te mo/zna pogrupowa/c nast/epuj/aco. (defun deprefixify-iso8859-2-region (start end) (interactive \"*r\") (ogonek-deprefixify-region start end ?/ \"iso8859-2\")) - (global-set-key \"\\C-cd\" 'deprefixify-iso8859-2-region) ; ctrl-c d + (global-set-key \"\\C-cd\" \\='deprefixify-iso8859-2-region) ; ctrl-c d (defun mazovia-to-iso8859-2 (start end) (interactive \"*r\") (ogonek-recode-region start end \"mazovia\" \"iso8859-2\")) - (global-set-key \"\\C-cr\" 'mazovia-to-iso8859-2) ; ctrl-c r + (global-set-key \"\\C-cr\" \\='mazovia-to-iso8859-2) ; ctrl-c r (defun prefixify-iso8859-2-region (start end) (interactive \"*r\") (ogonek-prefixify-region start end \"iso8859-2\" ?/)) - (global-set-key \"\\C-cp\" 'prefixify-iso8859-2-region) ; ctrl-c p + (global-set-key \"\\C-cp\" \\='prefixify-iso8859-2-region) ; ctrl-c p Ka/zd/a operacj/e przekodowania mo/zna w ca/lo/sci odwo/la/c przez wykonanie polecenia `undo'.") @@ -163,7 +163,7 @@ znak/ow diakrytycznych. Funkcje te mo/zna pogrupowa/c nast/epuj/aco. "Display `ogonek-informacja' in an auxiliary *ogonek-jak* buffer." (interactive) (set-buffer (get-buffer-create " *ogonek-jak*")) - (insert ogonek-informacja) + (insert (substitute-command-keys ogonek-informacja)) (switch-to-buffer " *ogonek-jak*") (goto-char (point-min))) @@ -233,10 +233,10 @@ The functions come in the following groups. to autoload the needed functions, for example by adding the following lines to your init file: - (autoload 'ogonek-how \"ogonek\") - (autoload 'ogonek-recode-region \"ogonek\") - (autoload 'ogonek-prefixify-region \"ogonek\") - (autoload 'ogonek-deprefixify-region \"ogonek\") + (autoload \\='ogonek-how \"ogonek\") + (autoload \\='ogonek-recode-region \"ogonek\") + (autoload \\='ogonek-prefixify-region \"ogonek\") + (autoload \\='ogonek-deprefixify-region \"ogonek\") The most frequent function calls can be abbreviated and assigned to keyboard keys. Here are a few practical examples: @@ -262,7 +262,7 @@ The functions come in the following groups. "Display `ogonek-information' in an auxiliary *recode-how* buffer." (interactive "*") (set-buffer (get-buffer-create " *ogonek-how*")) - (insert ogonek-information) + (insert (substitute-command-keys ogonek-information)) (switch-to-buffer " *ogonek-how*") (goto-char (point-min))) diff --git a/lisp/leim/quail/latin-ltx.el b/lisp/leim/quail/latin-ltx.el index 82c0aa3324e..3c84ba8348a 100644 --- a/lisp/leim/quail/latin-ltx.el +++ b/lisp/leim/quail/latin-ltx.el @@ -36,7 +36,7 @@ "LaTeX-like input method for many characters. These characters are from the charsets used by the `utf-8' coding system, including many technical ones. Examples: - \\'a -> á \\`{a} -> à + \\\\='a -> á \\\\=`{a} -> à \\pi -> π \\int -> ∫ ^1 -> ¹" '(("\t" . quail-completion)) @@ -184,7 +184,7 @@ system, including many technical ones. Examples: ("\\H" ?̋) ("\\H{}" ?˝) ("\\U{o}" ?ő) ("\\Uo" ?ő) ;; FIXME: Was it just a typo? - + ("\\OE" ?Œ) ;; ("{\\OE}" ?Œ) ("\\oe" ?œ) ;; ("{\\oe}" ?œ) @@ -216,7 +216,7 @@ system, including many technical ones. Examples: (name (if (match-end 1) (capitalize basename) (downcase basename)))) (concat "^" (if (> (length name) 1) "\\") name))) "\\`MODIFIER LETTER \\(?:SMALL\\|CAPITA\\(L\\)\\) \\([[:ascii:]]+\\)\\'") - + ;; ((lambda (name char) (format "^%s" (downcase (match-string 1 name)))) ;; "\\`MODIFIER LETTER SMALL \\(.\\)\\'") ;; ("^\\1" "\\`MODIFIER LETTER CAPITAL \\(.\\)\\'") @@ -694,7 +694,7 @@ system, including many technical ones. Examples: ("\\defs" ?≙) ; per fuzz/zed ;; ("\\sqrt[3]" ?∛) ("\\llbracket" ?\〚) ; stmaryrd - ("\\rrbracket" ?\〛) + ("\\rrbracket" ?\〛) ;; ("\\lbag" ?\〚) ; fuzz ;; ("\\rbag" ?\〛) ("\\ldata" ?\《) ; fuzz/zed diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 70307f6dcac..87f12ba673e 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -222,7 +222,7 @@ current year. The OLD-TIME-FORMAT is used for older files. To use ISO 8601 dates, you could set: \(setq ls-lisp-format-time-list - '(\"%Y-%m-%d %H:%M\" + \\='(\"%Y-%m-%d %H:%M\" \"%Y-%m-%d \"))" :type '(list (string :tag "Early time format") (string :tag "Old time format")) diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index ccd892640ec..14c45d1ec0b 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -566,7 +566,7 @@ but common in some proprietary systems." "If non-nil and the email has no Sender: header, use this value. May be nil, in which case nothing in particular is done with respect to Sender: lines. By design, will not replace an existing Sender: -line, but you can achieve that with a fiddle-plex 'replace action. +line, but you can achieve that with a fiddle-plex replace action. NB: it makes no sense to use the value t since there is no sensible default for Sender:. @@ -1745,7 +1745,7 @@ applied to a file after you've just read it from disk: for example, a feedmail FQM message file from a queue. You could use something like this: -\(setq auto-mode-alist \(cons \'\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) +\(setq auto-mode-alist \(cons \\='\(\"\\\\.fqm$\" . feedmail-vm-mail-mode\) auto-mode-alist\)\) " (feedmail-say-debug ">in-> feedmail-vm-mail-mode") (let ((the-buf (current-buffer))) diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 577cec0fd86..cd9df1f638a 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -119,11 +119,11 @@ completed. `pattern' is nil when `mail-directory-requery' is nil. The value might look like this: - '(remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\") + (remote-shell-program \"HOST\" \"-nl\" \"USER\" \"COMMAND\") or like this: - '(remote-shell-program \"HOST\" \"-n\" \"COMMAND '^\" pattern \"'\")" + (remote-shell-program \"HOST\" \"-n\" \"COMMAND \\='^\" pattern \"\\='\")" :type 'sexp :group 'mailalias) (put 'mail-directory-process 'risky-local-variable t) @@ -512,7 +512,7 @@ PREFIX is the string we want to complete." mail-aliases)) (if (consp mail-local-names) mail-local-names) - (or directory + (or directory (when (consp mail-directory-names) mail-directory-names))) (lambda (a b) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 5b5ee4ec2c5..4c0f2b98257 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -525,31 +525,33 @@ This also saves the value of `send-mail-function' via Customize." ;; Query the user. (with-temp-buffer (rename-buffer "*Emacs Mail Setup Help*" t) - (insert "\ + (insert (substitute-command-keys "\ Emacs is about to send an email message, but it has not been configured for sending email. To tell Emacs how to send email: - - Type `" + - Type `") (propertize "mail client" 'face 'bold) - "' to start your default email client and - pass it the message text.\n\n") + (substitute-command-keys "\ +' to start your default email client and + pass it the message text.\n\n")) (and sendmail-program (executable-find sendmail-program) - (insert "\ - - Type `" + (insert (substitute-command-keys "\ + - Type `") (propertize "transport" 'face 'bold) - "' to invoke the system's mail transport agent - (the `" + (substitute-command-keys "\ +' to invoke the system's mail transport agent + (the `") sendmail-program - "' program).\n\n")) - (insert "\ - - Type `" + (substitute-command-keys "' program).\n\n"))) + (insert (substitute-command-keys "\ + - Type `") (propertize "smtp" 'face 'bold) - "' to send mail directly to an \"outgoing mail\" server. + (substitute-command-keys "' to send mail directly to an \"outgoing mail\" server. (Emacs may prompt you for SMTP settings). Emacs will record your selection and will use it thereafter. - To change it later, customize the option `send-mail-function'.\n") + To change it later, customize the option `send-mail-function'.\n")) (goto-char (point-min)) (display-buffer (current-buffer)) (let ((completion-ignore-case t)) diff --git a/lisp/man.el b/lisp/man.el index c5dbcba83a1..23b2110a4ec 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -104,7 +104,7 @@ "Manpage cleaning filter command phrases. This variable contains a list of the following form: -'((command-string phrase-string*)*) + ((command-string phrase-string*)*) Each phrase-string is concatenated onto the command-string to form a command filter. The (standard) output (and standard error) of the Un*x diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 82c7a4dc1c1..9865d085444 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -162,7 +162,7 @@ compatibility with versions of Emacs that lack the variable (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\")) (image-load-path (cons (car load-path) - (when (boundp 'image-load-path) + (when (boundp \\='image-load-path) image-load-path)))) (mh-tool-bar-folder-buttons-init))" (unless library (error "No library specified")) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 22e4cd737ec..c89e71f5168 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1657,7 +1657,7 @@ using the Emacs 22 command \"emacsclient\" as follows: origMode polltime 10 headertime 0 - command emacsclient --eval '(mh-inc-spool-mh-e)' + command emacsclient --eval \\='(mh-inc-spool-mh-e)\\=' In XEmacs, the command \"gnuclient\" is used in a similar fashion." diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el index d3c3c80fd99..6198a125433 100644 --- a/lisp/mouse-copy.el +++ b/lisp/mouse-copy.el @@ -154,7 +154,7 @@ If you have the bug (or the real fix :-), please let me know." "Drag out a secondary selection, then paste it at the current point. To test this function, evaluate: - (global-set-key [M-down-mouse-1] 'mouse-drag-secondary-pasting) + (global-set-key [M-down-mouse-1] \\='mouse-drag-secondary-pasting) put the point at one place, then click and drag over some other region." (interactive "e") ;; Work-around: We see and react to each part of a multi-click event diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 945c305db7d..2b61096d86b 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -206,7 +206,7 @@ about which direction is natural. Perhaps it has to do with which hemisphere you're in.) To test this function, evaluate: - (global-set-key [down-mouse-2] 'mouse-drag-throw)" + (global-set-key [down-mouse-2] \\='mouse-drag-throw)" (interactive "e") ;; we want to do save-selected-window, but that requires 19.29 (let* ((start-posn (event-start start-event)) @@ -266,7 +266,7 @@ Drag scrolling is identical to the \"hand\" option in MacPaint, or the middle button in Tk text widgets. To test this function, evaluate: - (global-set-key [down-mouse-2] 'mouse-drag-drag)" + (global-set-key [down-mouse-2] \\='mouse-drag-drag)" (interactive "e") ;; we want to do save-selected-window, but that requires 19.29 (let* ((start-posn (event-start start-event)) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 3f8cb841c6f..757e368317a 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -439,7 +439,7 @@ For example, adding to the default a specific translation of an ange-ftp address to an HTTP URL: (setq browse-url-filename-alist - '((\"/webmaster@webserver:/home/www/html/\" . + \\='((\"/webmaster@webserver:/home/www/html/\" . \"http://www.acme.co.uk/\") (\"^/\\(ftp@\\|anonymous@\\)?\\([^:]+\\):/*\" . \"ftp://\\2/\") (\"^/\\([^:@]+@\\)?\\([^:]+\\):/*\" . \"ftp://\\1\\2/\") diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index a05108df0ae..ada2767a4d1 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -489,7 +489,7 @@ structure predicate for the type of element you want to retrieve. For example, to retrieve a message named \"foo\" when other elements named \"foo\" exist in the WSDL you could use: - (soap-wsdl-get \"foo\" WSDL 'soap-message-p) + (soap-wsdl-get \"foo\" WSDL \\='soap-message-p) If USE-LOCAL-ALIAS-TABLE is not nil, `soap-local-xmlns' will be used to resolve the namespace alias." diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 544aec5cfda..48e6a42186c 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -137,7 +137,7 @@ the external program knows about the root certificates you consider trustworthy, e.g.: \(setq tls-program - '(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" + \\='(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\" \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\" \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))" :type '(choice (const :tag "Always" t) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 6cec3c55bc9..c16384a6c6c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -972,14 +972,14 @@ checked via the following code: (erase-buffer) (let ((proc (start-process (buffer-name) (current-buffer) \"ssh\" \"-l\" user host \"wc\" \"-c\"))) - (when (memq (process-status proc) '(run open)) + (when (memq (process-status proc) \\='(run open)) (process-send-string proc (make-string sent ?\\ )) (process-send-eof proc) (process-send-eof proc)) (while (not (progn (goto-char (point-min)) (re-search-forward \"\\\\w+\" (point-max) t))) (accept-process-output proc 1)) - (when (memq (process-status proc) '(run open)) + (when (memq (process-status proc) \\='(run open)) (setq received (string-to-number (match-string 0))) (delete-process proc) (message \"Bytes sent: %s\\tBytes received: %s\" sent received) diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el index 0f57dfd1788..7e3dd66a56a 100644 --- a/lisp/obsolete/fast-lock.el +++ b/lisp/obsolete/fast-lock.el @@ -336,7 +336,7 @@ If nil, means information for all faces will be saved.") With arg, turn Fast Lock mode on if and only if arg is positive and the buffer is associated with a file. Enable it automatically in your `~/.emacs' by: - (setq font-lock-support-mode 'fast-lock-mode) + (setq font-lock-support-mode \\='fast-lock-mode) If Fast Lock mode is enabled, and the current buffer does not contain any text properties, any associated Font Lock cache is used if its timestamp matches the @@ -538,7 +538,7 @@ If the same file has different cache file names when edited on different machines, e.g., on one machine the cache file name has the prefix `#home', perhaps due to automount, try putting in your `~/.emacs' something like: - (setq directory-abbrev-alist (cons '(\"^/home/\" . \"/\") directory-abbrev-alist)) + (setq directory-abbrev-alist (cons \\='(\"^/home/\" . \"/\") directory-abbrev-alist)) Emacs automagically removes the common `/tmp_mnt' automount prefix by default. diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el index 885a11f7596..79afd80813f 100644 --- a/lisp/obsolete/lazy-lock.el +++ b/lisp/obsolete/lazy-lock.el @@ -466,7 +466,7 @@ See also `lazy-lock-stealth-load'." With arg, turn Lazy Lock mode on if and only if arg is positive. Enable it automatically in your `~/.emacs' by: - (setq font-lock-support-mode 'lazy-lock-mode) + (setq font-lock-support-mode \\='lazy-lock-mode) For a newer font-lock support mode with similar functionality, see `jit-lock-mode'. Eventually, Lazy Lock mode will be deprecated in diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el index c633bd5845b..ac67963571c 100644 --- a/lisp/obsolete/sym-comp.el +++ b/lisp/obsolete/sym-comp.el @@ -165,9 +165,9 @@ Uses `symbol-completion-symbol-function' and used something like this in a major mode which provides symbol completion: - (if (featurep 'hippie-exp) - (set (make-local-variable 'hippie-expand-try-functions-list) - (cons 'symbol-completion-try-complete + (if (featurep \\='hippie-exp) + (set (make-local-variable \\='hippie-expand-try-functions-list) + (cons \\='symbol-completion-try-complete hippie-expand-try-functions-list)))" (when (and symbol-completion-symbol-function symbol-completion-completions-function) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 3a87f6bedbd..9a64089059c 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -497,7 +497,7 @@ are prefix commands. For the dispatcher to display useful information, you should provide a description for the prefix, like (setq org-agenda-custom-commands - '((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\" + \\='((\"h\" . \"HOME + Name tag searches\") ; describe prefix \"h\" (\"hl\" tags \"+HOME+Lisa\") (\"hp\" tags \"+HOME+Peter\") (\"hk\" tags \"+HOME+Kim\")))" @@ -1932,7 +1932,7 @@ list as second element: For example, to display a 16px horizontal space for Emacs category, you can use: - (\"Emacs\" '(space . (:width (16))))" + (\"Emacs\" \\='(space . (:width (16))))" :group 'org-agenda-line-format :version "24.1" :type '(alist :key-type (string :tag "Regexp matching category") @@ -2538,7 +2538,7 @@ For example, if you have a custom agenda command \"p\" and you want this command to be accessible only from plain text files, use this: - '((\"p\" ((in-file . \"\\.txt\")))) + \\='((\"p\" ((in-file . \"\\.txt\")))) Here are the available contexts definitions: @@ -2556,7 +2556,7 @@ accessible if there is at least one valid check. You can also bind a key to another agenda custom command depending on contextual rules. - '((\"p\" \"q\" ((in-file . \"\\.txt\")))) + \\='((\"p\" \"q\" ((in-file . \"\\.txt\")))) Here it means: in .txt files, use \"p\" as the key for the agenda command otherwise associated with \"q\". (The command @@ -9596,7 +9596,7 @@ This is a command that has to be installed in `calendar-mode-map'." "Hebrew: " (calendar-hebrew-date-string date) " (until sunset)\n" "Islamic: " (calendar-islamic-date-string date) " (until sunset)\n" "French: " (calendar-french-date-string date) "\n" - "Baha'i: " (calendar-bahai-date-string date) " (until sunset)\n" + "Bahá’í: " (calendar-bahai-date-string date) " (until sunset)\n" "Mayan: " (calendar-mayan-date-string date) "\n" "Coptic: " (calendar-coptic-date-string date) "\n" "Ethiopic: " (calendar-ethiopic-date-string date) "\n" diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 7b4b6eadc5e..6a4b2bafb01 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -460,7 +460,7 @@ For example, if you have a capture template \"c\" and you want this template to be accessible only from `message-mode' buffers, use this: - '((\"c\" ((in-mode . \"message-mode\")))) + ((\"c\" ((in-mode . \"message-mode\")))) Here are the available contexts definitions: @@ -478,7 +478,7 @@ accessible if there is at least one valid check. You can also bind a key to another agenda custom command depending on contextual rules. - '((\"c\" \"d\" ((in-mode . \"message-mode\")))) + ((\"c\" \"d\" ((in-mode . \"message-mode\")))) Here it means: in `message-mode buffers', use \"c\" as the key for the capture template otherwise associated with \"d\". diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el index ae0f4946832..339f2b74afd 100644 --- a/lisp/org/org-protocol.el +++ b/lisp/org/org-protocol.el @@ -303,7 +303,7 @@ part." (defun org-protocol-flatten-greedy (param-list &optional strip-path replacement) "Greedy handlers might receive a list like this from emacsclient: - '((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") + ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")) where \"/dir/\" is the absolute path to emacsclients working directory. This function transforms it into a flat list using `org-protocol-flatten' and transforms the elements of that list as follows: @@ -347,7 +347,7 @@ returned list." (defun org-protocol-flatten (l) "Greedy handlers might receive a list like this from emacsclient: - '( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\") + ((\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")) where \"/dir/\" is the absolute path to emacsclients working directory. This function transforms it into a flat list." (if (null l) () @@ -365,9 +365,9 @@ link's URL to the `kill-ring'. The location for a browser's bookmark has to look like this: - javascript:location.href='org-protocol://store-link://'+ \\ + javascript:location.href=\\='org-protocol://store-link://\\='+ \\ encodeURIComponent(location.href) - encodeURIComponent(document.title)+'/'+ \\ + encodeURIComponent(document.title)+\\='/\\='+ \\ Don't use `escape()'! Use `encodeURIComponent()' instead. The title of the page could contain slashes and the location definitely will. @@ -396,16 +396,16 @@ The sub-protocol used to reach this function is set in This function detects an URL, title and optional text, separated by `/'. The location for a browser's bookmark looks like this: - javascript:location.href='org-protocol://capture://'+ \\ - encodeURIComponent(location.href)+'/' \\ - encodeURIComponent(document.title)+'/'+ \\ + javascript:location.href=\\='org-protocol://capture://\\='+ \\ + encodeURIComponent(location.href)+\\='/\\=' \\ + encodeURIComponent(document.title)+\\='/\\='+ \\ encodeURIComponent(window.getSelection()) By default, it uses the character `org-protocol-default-template-key', which should be associated with a template in `org-capture-templates'. But you may prepend the encoded URL with a character and a slash like so: - javascript:location.href='org-protocol://capture://b/'+ ... + javascript:location.href=\\='org-protocol://capture://b/\\='+ ... Now template ?b will be used." (if (and (boundp 'org-stored-links) @@ -455,7 +455,7 @@ in `org-protocol-project-alist'. The location for a browser's bookmark should look like this: - javascript:location.href='org-protocol://open-source://'+ \\ + javascript:location.href=\\='org-protocol://open-source://\\='+ \\ encodeURIComponent(location.href)" ;; As we enter this function for a match on our protocol, the return value ;; defaults to nil. diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el index 8a6c77a8182..c970fe6c851 100644 --- a/lisp/org/org-src.el +++ b/lisp/org/org-src.el @@ -166,10 +166,10 @@ other-frame Use `switch-to-buffer-other-frame' to display edit buffer. (const reorganize-frame))) (defvar org-src-mode-hook nil - "Hook run after Org switched a source code snippet to its Emacs mode. + "Hook run after Org switched a source code snippet to its Emacs mode. This hook will run -- when editing a source code snippet with \"C-c '\". +- when editing a source code snippet with `\\[org-src-mode-map]'. - When formatting a source code snippet for export with htmlize. You may want to use this hook for example to turn off `outline-minor-mode' @@ -226,7 +226,7 @@ the existing edit buffer." (define-minor-mode org-src-mode "Minor mode for language major mode buffers generated by org. This minor mode is turned on in two situations: -- when editing a source code snippet with \"C-c '\". +- when editing a source code snippet with `\\[org-src-mode-map]'. - When formatting a source code snippet for export with htmlize. There is a mode hook, and keybindings for `org-edit-src-exit' and `org-edit-src-save'") diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index fb593674ec4..f05ab7ad1c4 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -545,8 +545,8 @@ slightly, to make sure a beginning of line in the first line is included. SEPARATOR specifies the field separator in the lines. It can have the following values: -'(4) Use the comma as a field separator -'(16) Use a TAB as field separator +(4) Use the comma as a field separator +(16) Use a TAB as field separator integer When a number, use that many spaces as field separator nil When nil, the command tries to be smart and figure out the separator in the following way: diff --git a/lisp/org/org.el b/lisp/org/org.el index 963da77f592..587d7654409 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1982,7 +1982,7 @@ file identifier are filename matches the regexp. If you want to use groups here, use shy groups. - Example: (\"\\.x?html\\'\" . \"firefox %s\") + Example: (\"\\.x?html\\\\='\" . \"firefox %s\") (\"\\(?:xhtml\\|html\\)\" . \"firefox %s\") to open *.html and *.xhtml with firefox. @@ -1998,7 +1998,7 @@ file identifier are In a custom lisp form, you can access the group matches with (match-string n link). - Example: (\"\\.pdf::\\(\\d+\\)\\'\" . \"evince -p %1 %s\") + Example: (\"\\.pdf::\\(\\d+\\)\\\\='\" . \"evince -p %1 %s\") to open [[file:document.pdf::5]] with evince at page 5. `directory' Matches a directory @@ -12222,13 +12222,13 @@ With a triple \\[universal-argument] prefix, circumvent any state blocking. With a numeric prefix arg of 0, inhibit note taking for the change. For calling through lisp, arg is also interpreted in the following way: -'none -> empty state -\"\"(empty string) -> switch to empty state -'done -> switch to DONE -'nextset -> switch to the next set of keywords -'previousset -> switch to the previous set of keywords -\"WAITING\" -> switch to the specified keyword, but only if it - really is a member of `org-todo-keywords'." +`none' -> empty state +\"\" (empty string) -> switch to empty state +`done' -> switch to DONE +`nextset' -> switch to the next set of keywords +`previousset' -> switch to the previous set of keywords +\"WAITING\" -> switch to the specified keyword, but only if it + really is a member of `org-todo-keywords'." (interactive "P") (if (and (org-region-active-p) org-loop-over-headlines-in-active-region) (let ((cl (if (eq org-loop-over-headlines-in-active-region 'start-level) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index a0573d04c10..5d8e48ea97a 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -1060,7 +1060,7 @@ keywords are understood: Menu entry for the export dispatcher. It should be a list like: - '(KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU) + (KEY DESCRIPTION-OR-ORDINAL ACTION-OR-MENU) where : @@ -1084,17 +1084,17 @@ keywords are understood: If it is an alist, associations should follow the pattern: - '(KEY DESCRIPTION ACTION) + (KEY DESCRIPTION ACTION) where KEY, DESCRIPTION and ACTION are described above. Valid values include: - '(?m \"My Special Back-end\" my-special-export-function) + (?m \"My Special Back-end\" my-special-export-function) or - '(?l \"Export to LaTeX\" + (?l \"Export to LaTeX\" \(?p \"As PDF file\" org-latex-export-to-pdf) \(?o \"As PDF file and open\" \(lambda (a s v b) @@ -1105,7 +1105,7 @@ keywords are understood: or the following, which will be added to the previous sub-menu, - '(?l 1 + (?l 1 \((?B \"As TEX buffer (Beamer)\" org-beamer-export-as-latex) \(?P \"As PDF file (Beamer)\" org-beamer-export-to-pdf))) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index f26b8ec6dd1..82f0d722d03 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -634,7 +634,7 @@ move into or out of sexps (not even normal expression parentheses). If point is already at the earliest statement within braces or parens, this function doesn't move back into any whitespace preceding it; it -returns 'same in this case. +returns `same' in this case. Stop at statement continuation tokens like \"else\", \"catch\", \"finally\" and the \"while\" in \"do ... while\" if the start point @@ -656,19 +656,19 @@ start of the definition in a \"#define\". Also stop at start of macros before leaving them. Return: -'label if stopped at a label or \"case...:\" or \"default:\"; -'same if stopped at the beginning of the current statement; -'up if stepped to a containing statement; -'previous if stepped to a preceding statement; -'beginning if stepped from a statement continuation clause to +`label' if stopped at a label or \"case...:\" or \"default:\"; +`same' if stopped at the beginning of the current statement; +`up' if stepped to a containing statement; +`previous' if stepped to a preceding statement; +`beginning' if stepped from a statement continuation clause to its start clause; or -'macro if stepped to a macro start. -Note that 'same and not 'label is returned if stopped at the same +`macro' if stepped to a macro start. +Note that `same' and not `label' is returned if stopped at the same label without crossing the colon character. LIM may be given to limit the search. If the search hits the limit, point will be left at the closest following token, or at the start -position if that is less ('same is returned in this case). +position if that is less (`same' is returned in this case). NOERROR turns off error logging to `c-parsing-error'. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 0e904d23c5b..a1e26b9fcc4 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -926,14 +926,14 @@ following elements. The car of each element describes the type of the operator group, and the cdr is a list of the operator tokens in it. The operator group types are: -'prefix Unary prefix operators. -'postfix Unary postfix operators. -'postfix-if-paren +`prefix' Unary prefix operators. +`postfix' Unary postfix operators. +`postfix-if-paren' Unary postfix operators if and only if the chars have parenthesis syntax. -'left-assoc Binary left associative operators (i.e. a+b+c means (a+b)+c). -'right-assoc Binary right associative operators (i.e. a=b=c means a=(b=c)). -'right-assoc-sequence +`left-assoc' Binary left associative operators (i.e. a+b+c means (a+b)+c). +`right-assoc' Binary right associative operators (i.e. a=b=c means a=(b=c)). +`right-assoc-sequence' Right associative operator that constitutes of a sequence of tokens that separate expressions. All the tokens in the group are in this case taken as diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index df6e987721b..da36647f2cd 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -833,7 +833,7 @@ string in the mode line), and a semicolon or comma is typed (see no arguments, and should return one of the following values: nil -- no determination made, continue checking - 'stop -- do not insert a newline, and stop checking + `stop' -- do not insert a newline, and stop checking (anything else) -- insert a newline, and stop checking If every function in the list is called with no determination made, diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 322024ea448..b8ba170a246 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -724,7 +724,7 @@ mode-compile.el. If your Emacs does not default to `cperl-mode' on Perl files, and you want it to: put the following into your .emacs file: - (defalias 'perl-mode 'cperl-mode) + (defalias \\='perl-mode \\='cperl-mode) Get perl5-info from $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index bcabf3cdf59..1ea9f174775 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1322,7 +1322,7 @@ which see." 0 - contains the last symbol read from the buffer. 1 - contains the string last displayed in the echo area for variables, or argument string for functions. - 2 - 'function if function args, 'variable if variable documentation.") + 2 - `function' if function args, `variable' if variable documentation.") (defun elisp-eldoc-documentation-function () "`eldoc-documentation-function' (which see) for Emacs Lisp." diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 43b057ba882..e8a1ae455ee 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1425,7 +1425,7 @@ single - statement is not continued. begin - current line is the first in a continued statement. end - current line is the last in a continued statement middle - current line is neither first nor last in a continued statement. -Comment lines embedded amongst continued lines return 'middle." +Comment lines embedded amongst continued lines return `middle'." (let (pcont cont) (save-excursion (setq pcont (if (f90-previous-statement) (f90-line-continued)))) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 83e427da790..ee4733f6e4e 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -817,15 +817,15 @@ Variables controlling indentation style and extra features: Amount of extra indentation for text in full-line comments (default 0). `fortran-comment-indent-style' How to indent the text in full-line comments. Allowed values are: - nil don't change the indentation - fixed indent to `fortran-comment-line-extra-indent' beyond the + nil don't change the indentation + `fixed' indent to `fortran-comment-line-extra-indent' beyond the value of either `fortran-minimum-statement-indent-fixed' (fixed format) or `fortran-minimum-statement-indent-tab' (TAB format), depending on the continuation format in use. - relative indent to `fortran-comment-line-extra-indent' beyond the + `relative' indent to `fortran-comment-line-extra-indent' beyond the indentation for a line of code. - (default 'fixed) + (default `fixed') `fortran-comment-indent-char' Single-character string to be inserted instead of space for full-line comment indentation (default \" \"). diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 9942e17397a..1eff62c5acf 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2065,7 +2065,7 @@ a GDB/MI reply message." (defun gdbmi-bnf-gdb-prompt () "Implementation of the following GDB/MI output grammar rule: gdb-prompt ==> - '(gdb)' nl + `(gdb)' nl nl ==> CR | CR-LF" @@ -2085,7 +2085,7 @@ a GDB/MI reply message." "Implementation of the following GDB/MI output grammar rule: result-record ==> - [ token ] '^' result-class ( ',' result )* nl + [ token ] `^' result-class ( `,' result )* nl token ==> any sequence of digits." @@ -2110,16 +2110,16 @@ a GDB/MI reply message." exec-async-output | status-async-output | notify-async-output exec-async-output ==> - [ token ] '*' async-output + [ token ] `*' async-output status-async-output ==> - [ token ] '+' async-output + [ token ] `+' async-output notify-async-output ==> - [ token ] '=' async-output + [ token ] `=' async-output async-output ==> - async-class ( ',' result )* nl" + async-class ( `,' result )* nl" (gdbmi-bnf-result-and-async-record-impl)) @@ -2130,13 +2130,13 @@ a GDB/MI reply message." console-stream-output | target-stream-output | log-stream-output console-stream-output ==> - '~' c-string + `~' c-string target-stream-output ==> - '@' c-string + `@' c-string log-stream-output ==> - '&' c-string" + `&' c-string" (when (< gdbmi-bnf-offset (length gud-marker-acc)) (if (and (member (aref gud-marker-acc gdbmi-bnf-offset) '(?~ ?@ ?&)) (string-match (concat "\\([~@&]\\)\\(" gdb--string-regexp "\\)\n") diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index b5e799848de..ce2f830ec42 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -152,7 +152,7 @@ This variable can have 3 values: nil Arrows just move the cursor t Arrows force the cursor back to the current command line and walk the history -'cmdline When the cursor is in the current command line, arrows walk the +`cmdline' When the cursor is in the current command line, arrows walk the history. Everywhere else in the buffer, arrows move the cursor." :group 'idlwave-shell-general-setup :type '(choice @@ -439,15 +439,13 @@ Value decides about the method which is used to mark the line. Valid values are: nil Do not mark the line -'arrow Use the overlay arrow -'face Use `idlwave-shell-stop-line-face' to highlight the line. +`arrow' Use the overlay arrow +`face' Use `idlwave-shell-stop-line-face' to highlight the line. t Use what IDLWAVE thinks is best. Will be a face where possible, otherwise the overlay arrow. The overlay-arrow has the disadvantage to hide the first chars of a line. Since many people do not have the main block of IDL programs indented, -a face highlighting may be better. -In Emacs 21, the overlay arrow is displayed in a special area and never -hides any code, so setting this to 'arrow on Emacs 21 sounds like a good idea." +a face highlighting may be better." :group 'idlwave-shell-highlighting-and-faces :type '(choice (const :tag "No marking" nil) @@ -494,10 +492,10 @@ where IDL is stopped, when in Electric Debug Mode." "Non-nil means, mark breakpoints in the source files. Valid values are: nil Do not mark breakpoints. -'face Highlight line with `idlwave-shell-breakpoint-face'. -'glyph Red dot at the beginning of line. If the display does not - support glyphs, will use 'face instead. -t Glyph when possible, otherwise face (same effect as 'glyph)." +`face' Highlight line with `idlwave-shell-breakpoint-face'. +`glyph' Red dot at the beginning of line. If the display does not + support glyphs, will use `face' instead. +t Glyph when possible, otherwise face (same effect as `glyph')." :group 'idlwave-shell-highlighting-and-faces :type '(choice (const :tag "No marking" nil) @@ -3911,7 +3909,7 @@ Elements of the alist have the form: (defun idlwave-shell-module-source-query (module &optional type) "Determine the source file for a given module. -Query as a function if TYPE set to something beside 'pro." +Query as a function if TYPE set to something beside `pro'." (if module (idlwave-shell-send-command (format "print,(routine_info('%s',/SOURCE%s)).PATH" module diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index daf919adb2f..9930d501d4d 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -376,7 +376,7 @@ The following values are allowed: nil Don't scan any buffers. t Scan all `idlwave-mode' buffers in the current editing session. -current Scan only the current buffer, but no other buffers." +`current' Scan only the current buffer, but no other buffers." :group 'idlwave-routine-info :type '(choice (const :tag "No buffer" nil) @@ -5833,15 +5833,15 @@ to override IDLWAVE's idea of what should be completed at point. Possible values are: 0 <=> query for the completion type -1 <=> 'procedure -2 <=> 'procedure-keyword -3 <=> 'function -4 <=> 'function-keyword -5 <=> 'procedure-method -6 <=> 'procedure-method-keyword -7 <=> 'function-method -8 <=> 'function-method-keyword -9 <=> 'class +1 <=> `procedure' +2 <=> `procedure-keyword' +3 <=> `function' +4 <=> `function-keyword' +5 <=> `procedure-method' +6 <=> `procedure-method-keyword' +7 <=> `function-method' +8 <=> `function-method-keyword' +9 <=> `class' As a special case, the universal argument C-u forces completion of function names in places where the default would be a keyword. diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index b95c3f97117..5a4ed84c346 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -402,11 +402,11 @@ Only used in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions." (defcustom prolog-parse-mode 'beg-of-clause "The parse mode used (decides from which point parsing is done). Legal values: -'beg-of-line - starts parsing at the beginning of a line, unless the - previous line ends with a backslash. Fast, but has - problems detecting multiline /* */ comments. -'beg-of-clause - starts parsing at the beginning of the current clause. - Slow, but copes better with /* */ comments." +`beg-of-line' - starts parsing at the beginning of a line, unless the + previous line ends with a backslash. Fast, but has + problems detecting multiline /* */ comments. +`beg-of-clause' - starts parsing at the beginning of the current clause. + Slow, but copes better with /* */ comments." :version "24.1" :group 'prolog-indentation :type '(choice (const :value beg-of-line) @@ -1209,7 +1209,7 @@ using the commands `send-region', `send-string' and \\[prolog-consult-region]. Commands: Tab indents for Prolog; with argument, shifts rest of expression rigidly with the current line. -Paragraphs are separated only by blank lines and '%%'. '%'s start comments. +Paragraphs are separated only by blank lines and `%%'. `%'s start comments. Return at end of buffer sends line as input. Return not at end copies rest of line to end and sends it. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 63a43c1b31a..a95206463b6 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2979,7 +2979,7 @@ This is a wrapper over `buffer-substring' that takes care of different transformations for the code sent to be evaluated in the python shell: 1. When optional argument NOMAIN is non-nil everything under an - \"if __name__ == '__main__'\" block will be removed. + \"if __name__ == \\='__main__\\='\" block will be removed. 2. When a subregion of the buffer is sent, it takes care of appending extra empty lines so tracebacks are correct. 3. When the region sent is a substring of the current buffer, a diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 47b15d886bc..34ac5995568 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4361,7 +4361,7 @@ Usage: ;;; --> \" := \" [[ --> [ --CR --> comment-out code .. --> \" => \" ] --> ) --- --> horizontal line ,, --> \" <= \" ]] --> ] ---- --> display comment - == --> \" == \" '' --> \\\" + == --> \" == \" \\='\\=' --> \\\" WORD COMPLETION: @@ -4808,7 +4808,7 @@ Usage: automatically recognized as VHDL source files. To add an extension \".xxx\", add the following line to your Emacs start-up file (`.emacs'): - \(push '(\"\\\\.xxx\\\\'\" . vhdl-mode) auto-mode-alist) + \(push \\='(\"\\\\.xxx\\\\\\='\" . vhdl-mode) auto-mode-alist) HINTS: diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index b0a8eb7a316..7eff1f123b5 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -390,8 +390,8 @@ elements is negated." "Go to the location of ITEM and display the buffer. WINDOW controls how the buffer is displayed: nil -- switch-to-buffer - 'window -- pop-to-buffer (other window) - 'frame -- pop-to-buffer (other frame)" + `window' -- pop-to-buffer (other window) + `frame' -- pop-to-buffer (other frame)" (let* ((marker (save-excursion (xref-location-marker (xref-item-location item)))) (buf (marker-buffer marker))) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 2989274ac55..97c977cf1fc 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -203,7 +203,7 @@ the user is done with the current expansion list.") ) "List of functions to periodically call stealthily. This list is of the form: - '( (\"NAME\" FUNCTION ...) + ( (\"NAME\" FUNCTION ...) ...) where NAME is the name of the major display mode these functions are for, and the remaining elements FUNCTION are functions to call in order. @@ -458,9 +458,9 @@ items is reached." (defcustom speedbar-directory-button-trim-method 'span "Indicates how the directory button will be displayed. Possible values are: - 'span - span large directories over multiple lines. - 'trim - trim large directories to only show the last few. - nil - no trimming." + `span' - span large directories over multiple lines. + `trim' - trim large directories to only show the last few. + nil - no trimming." :group 'speedbar :type '(radio (const :tag "Span large directories over multiple lines." span) diff --git a/lisp/startup.el b/lisp/startup.el index e0249593893..8778c617bc8 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -86,7 +86,7 @@ or if your init file contains a line of this form: (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\") If your init file is byte-compiled, use the following form instead: - (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")) + (eval \\='(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")) Thus, someone else using a copy of your init file will see the startup message unless he personally acts to inhibit it." :type '(choice (const :tag "Don't inhibit") diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 3fe21c482d6..87c2a95da49 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -388,7 +388,7 @@ It consists of pairs (REGEXP . DICTIONARY). If REGEXP is found in the message headers, `ispell-local-dictionary' will be set to DICTIONARY if `ispell-local-dictionary' is not buffer-local. E.g. you may use the following value: - '((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\") + ((\"^Newsgroups:[ \\t]*de\\\\.\" . \"deutsch8\") (\"^To:[^\\n,]+\\\\.de[ \\t\\n,>]\" . \"deutsch8\"))" :type '(repeat (cons regexp string)) :group 'ispell) @@ -484,7 +484,7 @@ The function must take one string argument and return a string." "When non-nil ispell uses framepop to display choices in a dedicated frame. You can set this variable to dynamically use framepop if you are in a window system by evaluating the following on startup to set this variable: - (and window-system (condition-case () (require 'framepop) (error nil)))" + (and window-system (condition-case () (require \\='framepop) (error nil)))" :type 'boolean :group 'ispell) diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index a8f5fcefe30..482dd4c6396 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -1153,9 +1153,9 @@ path." "Sorting of the entries found in BibTeX databases by reftex-citation. Possible values: nil Do not sort entries. -'author Sort entries by author name. -'year Sort entries by increasing year. -'reverse-year Sort entries by decreasing year." +`author' Sort entries by author name. +`year' Sort entries by increasing year. +`reverse-year' Sort entries by decreasing year." :group 'reftex-citation-support :type '(choice (const :tag "not" nil) (const :tag "by author" author) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 7a2857a2d5e..9625ec2c7cc 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -2138,15 +2138,15 @@ for completion and choices. (a) If user selects bullets or #, it's just added. (b) If user selects enumerations, a further prompt is given. User needs to - input a starting item, for example 'e' for 'A)' style. + input a starting item, for example `e' for `A)' style. The position of the new list is arranged according to whether or not the current line and the previous line are blank lines. 2. When continuing a list, one thing needs to be noticed: -List style alphabetical list, such as 'a.', and roman numerical list, such as -'i.', have some overlapping items, for example 'v.' The function can deal with +List style alphabetical list, such as `a.', and roman numerical list, such as +`i.', have some overlapping items, for example `v.' The function can deal with the problem elegantly in most situations. But when those overlapped list are preceded by a blank line, it is hard to determine which type to use automatically. The function uses alphabetical list by default. If you want diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 1d872f08749..cb65e5f1073 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -2066,7 +2066,7 @@ Images in many formats can be inlined with <img src=\"URL\">. If you mainly create your own documents, `sgml-specials' might be interesting. But note that some HTML 2 browsers can't handle `''. To work around that, do: - (eval-after-load \"sgml-mode\" '(aset sgml-char-names ?\\=' nil)) + (eval-after-load \"sgml-mode\" \\='(aset sgml-char-names ?\\=' nil)) \\{html-mode-map}" (setq-local sgml-display-text html-display-text) diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index 0ce70644b03..0508426619f 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el @@ -1407,7 +1407,7 @@ level in the Texinfo file; when looking for the `Previous' pointer, the section found will be at the same or higher hierarchical level in the Texinfo file; when looking for the `Up' pointer, the section found will be at some level higher in the Texinfo file. The fourth argument -\(one of `next’, `previous’, or `up'\) specifies whether to find the +\(one of `next', `previous', or `up'\) specifies whether to find the `Next', `Previous', or `Up' pointer." (let ((case-fold-search t)) (cond ((eq direction 'next) diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index c94e417a7ea..0e645fcdd38 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -160,7 +160,7 @@ a simple pass through function could be used: (setq-local tildify-foreach-region-function (lambda (cb beg end) (funcall cb beg end))) or better still: - (setq-local tildify-foreach-region-function 'funcall) + (setq-local tildify-foreach-region-function \\='funcall) See `tildify-foreach-ignore-environments' function for other ways to use the variable." :version "25.1" diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 409ba7c65c9..da83f3a1a63 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -235,7 +235,7 @@ Optional arguments are: ARG any arguments to the ACTION command, OUTPUT-FORMAT is the file format to output (default is jpeg), ACTION-PREFIX is the symbol to place before the ACTION command - (defaults to '-' but can sometimes be '+')." + (defaults to `-' but can sometimes be `+')." (call-process thumbs-conversion-program nil nil nil (or action-prefix "-") action diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el index a29658ab9b3..0f1e4de852b 100644 --- a/lisp/tree-widget.el +++ b/lisp/tree-widget.el @@ -294,9 +294,9 @@ Typically it should contain something like this: (tree-widget-set-parent-theme \"my-parent-theme\") (tree-widget-set-image-properties - (if (featurep 'xemacs) - '(:ascent center) - '(:ascent center :mask (heuristic t)) + (if (featurep \\='xemacs) + \\='(:ascent center) + \\='(:ascent center :mask (heuristic t)) ))" (or name (setq name (or tree-widget-theme "default"))) (unless (string-equal name (tree-widget-theme-name)) diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 13b97744131..e011b96ada2 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -285,7 +285,7 @@ Will not do anything if `url-show-status' is nil." "Build a query-string. Given a QUERY in the form: -'((key1 val1) + ((key1 val1) (key2 val2) (key3 val1 val2) (key4) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 7e752776ba9..46c2ec3c69f 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -122,9 +122,9 @@ cookies -- never accept HTTP cookies Samples: - (setq url-privacy-level 'high) - (setq url-privacy-level '(email lastloc)) ;; equivalent to 'high - (setq url-privacy-level '(os)) + (setq url-privacy-level \\='high) + (setq url-privacy-level \\='(email lastloc)) ;; equivalent to \\='high + (setq url-privacy-level \\='(os)) ::NOTE:: This variable controls several other variables and is _NOT_ automatically diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index c81afce016d..7bfc3b60b4a 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -1456,7 +1456,8 @@ Useful commands: (map-extents 'delete-extent) (mapc 'delete-overlay (overlays-in 1 1))) - (insert "This is a registry of all active Ediff sessions. + (insert (substitute-command-keys "\ +This is a registry of all active Ediff sessions. Useful commands: button2, `v', RET over a session record: switch to that session @@ -1471,7 +1472,7 @@ Useful commands: \t\tActive Ediff Sessions: \t\t---------------------- -") +")) ;; purge registry list from dead buffers (mapc (lambda (elt) (if (not (ediff-buffer-live-p elt)) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index b665034d135..b45d533caea 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -406,7 +406,7 @@ other files, enter /dev/null (with-output-to-temp-buffer ediff-msg-buffer (ediff-with-current-buffer standard-output (fundamental-mode)) - (princ (format " + (princ (format-message " Ediff has inferred that %s %s diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index e674f0e4d4e..3e6d2a95051 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -380,14 +380,14 @@ If the argument is a list, the files must all have the same back end." If FILES are not registered, this function always returns nil. For registered files, the possible values are: - 'implicit FILES are always writable, and checked out `implicitly' + `implicit' FILES are always writable, and checked out `implicitly' when the user saves the first changes to the file. - 'locking FILES are read-only if up-to-date; user must type + `locking' FILES are read-only if up-to-date; user must type \\[vc-next-action] before editing. Strict locking is assumed. - 'announce FILES are read-only if up-to-date; user must type + `announce' FILES are read-only if up-to-date; user must type \\[vc-next-action] before editing. But other users may be editing at the same time." (vc-call-backend backend 'checkout-model files)) @@ -416,10 +416,10 @@ For registered files, the possible values are: A return of nil from this function means we have no information on the status of this file. Otherwise, the value returned is one of: - 'up-to-date The working file is unmodified with respect to the + `up-to-date' The working file is unmodified with respect to the latest version on the current branch, and not locked. - 'edited The working file has been edited by the user. If + `edited' The working file has been edited by the user. If locking is used for the file, this state means that the current version is locked by the calling user. This status should *not* be reported for files @@ -429,44 +429,44 @@ status of this file. Otherwise, the value returned is one of: USER The current version of the working file is locked by some other USER (a string). - 'needs-update The file has not been edited by the user, but there is + `needs-update' The file has not been edited by the user, but there is a more recent version on the current branch stored in the repository. - 'needs-merge The file has been edited by the user, and there is also + `needs-merge' The file has been edited by the user, and there is also a more recent version on the current branch stored in the repository. This state can only occur if locking is not used for the file. - 'unlocked-changes The working version of the file is not locked, + `unlocked-changes' The working version of the file is not locked, but the working file has been changed with respect to that version. This state can only occur for files with locking; it represents an erroneous condition that should be resolved by the user (vc-next-action will prompt the user to do it). - 'added Scheduled to go into the repository on the next commit. + `added' Scheduled to go into the repository on the next commit. Often represented by vc-working-revision = \"0\" in VCSes with monotonic IDs like Subversion and Mercurial. - 'removed Scheduled to be deleted from the repository on next commit. + `removed' Scheduled to be deleted from the repository on next commit. - 'conflict The file contains conflicts as the result of a merge. + `conflict' The file contains conflicts as the result of a merge. For now the conflicts are text conflicts. In the future this might be extended to deal with metadata conflicts too. - 'missing The file is not present in the file system, but the VC + `missing' The file is not present in the file system, but the VC system still tracks it. - 'ignored The file showed up in a dir-status listing with a flag + `ignored' The file showed up in a dir-status listing with a flag indicating the version-control system is ignoring it, Note: This property is not set reliably (some VCSes don't have useful directory-status commands) so assume that any file with vc-state nil might be ignorable without VC knowing it. - 'unregistered The file is not under version control." + `unregistered' The file is not under version control." ;; Note: in Emacs 22 and older, return of nil meant the file was ;; unregistered. This is potentially a source of diff --git a/lisp/widget.el b/lisp/widget.el index d62f7ffd8d1..aadb063161c 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -80,7 +80,7 @@ create identical widgets: * (widget-create NAME) -* (apply 'widget-create CLASS ARGS) +* (apply \\='widget-create CLASS ARGS) The third argument DOC is a documentation string for the widget." ;; diff --git a/lisp/window.el b/lisp/window.el index 65b4ef08268..6d189055c15 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5868,7 +5868,7 @@ one of the regular expressions in `special-display-regexps'. This variable can be set in your init file, like this: - (setq special-display-frame-alist '((width . 80) (height . 20))) + (setq special-display-frame-alist \\='((width . 80) (height . 20))) These supersede the values given in `default-frame-alist'." :type '(repeat (cons :format "%v" diff --git a/lisp/woman.el b/lisp/woman.el index de2cbc100ea..f2e59e50bca 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -786,7 +786,7 @@ without interactive confirmation, if it exists as a topic." (defvar woman-file-regexp nil "Regexp used to select (possibly compressed) man source files, e.g. -\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\|xz\\)\\)?\\'\". +\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\|xz\\)\\)?\\\\='\". Built automatically from the customizable user options `woman-uncompressed-file-regexp' and `woman-file-compression-regexp'.") @@ -816,7 +816,7 @@ becoming more common in the GNU world. For example, the man pages in the ncurses package include `toe.1m', `form.3x', etc. Note: an optional compression regexp will be appended, so this regexp -MUST NOT end with any kind of string terminator such as $ or \\'." +MUST NOT end with any kind of string terminator such as $ or \\\\='." :type 'regexp :set 'set-woman-file-regexp :group 'woman-interface) @@ -826,8 +826,8 @@ MUST NOT end with any kind of string terminator such as $ or \\'." "Do not change this unless you are sure you know what you are doing! Regexp used to match compressed man file extensions for which decompressors are available and handled by auto-compression mode, -e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\|xz\\\\)\\\\'\" for `gzip', `bzip2', or `xz'. -Should begin with \\. and end with \\' and MUST NOT be optional." +e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\|xz\\\\)\\\\\\='\" for `gzip', `bzip2', or `xz'. +Should begin with \\. and end with \\\\=' and MUST NOT be optional." ;; Should be compatible with car of ;; `jka-compr-file-name-handler-entry', but that is unduly ;; complicated, includes an inappropriate extension (.tgz) and is @@ -3719,7 +3719,7 @@ expression in parentheses. Leaves point after the value." "Find and return start of next control line. PAT, if non-nil, specifies an additional component of the control line regexp to search for, which is appended to the default -regexp, \"\\(\\\\c\\)?\\n[.']\"." +regexp, \"\\(\\\\c\\)?\\n[.\\=']\"." (let ((pattern (concat "\\(\\\\c\\)?\n[.']" pat)) to) (save-excursion @@ -3981,7 +3981,7 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric." (goto-char from))) (defun woman-horizontal-line () - "\\l'Nc' -- Draw a horizontal line of length N using character c, default _." + "\\l\\='Nc\\=' -- Draw a horizontal line of length N using character c, default _." (delete-char -1) (delete-char 1) (looking-at "\\(.\\)\\(.*\\)\\1") |