Subject: bug#41100: emacs-27 7081c1d: Fix typos in the Emacs user manual

From: Paul Eggert <[email-masked]>
Date: Sat, 9 May 2020 14:29:00 -0700

On 5/8/20 10:22 AM, Eli Zaretskii wrote:
>> They all seem to display fine in eg
>> https://www.gnu.org/software/emacs/manual/pdf/emacs-xtra.pdf
> Sebastian seems to say that is not the case?
The original problem report was about the Texinfo input “Bahá'í” (with U+0027
APOSTROPHE), which Texinfo renders as “Bahá’í” (with U+2019 RIGHT SINGLE
QUOTATION MARK) in info and as something similar-looking in TeX.

The quick patch was to change the Texinfo input to “Bah@'{a}@t{'}@'{i}”; the @'
calls were to suppress false-alarm diagnostics and I don't know why the @t{'}
was put in.

It now appears that there's no need to worry about the false-alarm diagnostics
(the output is fine, as Glenn noted). Also, the @t{'} is not necessary in that
it puts one wrong character into the output (namely, U+0027) instead of a
different wrong character (namely, U+2019).

The preferred Unicode spelling these days is “Baháʼí” (with U+02BC MODIFIED
LETTER APOSTROPHE). However, although Texinfo can handle that character and puts
it into info files, the character doesn’t survive transliteration to TeX (it
gets lost). I don't know whether this is a bug in Texinfo or in TeX, but anyway
we need to work around it if we're going to use the correct spelling.

I suggest that we use the preferred spelling in info files, and fall back on the
previous behavior of using apostrophe (which TeX renders like the right single
quotation mark) when outputting to TeX. I’m attaching a proposed patch, which I
emailed to Eli earlier before seeing this bug report. This patch also fixes
other instances of similar problems that I found.
From 6793317f5e24da256298861c02fc6aba9cb1b5a0 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Sat, 9 May 2020 12:56:09 -0700
Subject: [PATCH] =?UTF-8?q?Improve=20spelling=20of=20Bah=C3=A1=CA=BC=C3=AD?=
 =?UTF-8?q?=20words?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/calendar/cal-bahai.el (calendar-bahai-month-name-array):
(calendar-bahai-print-date, calendar-bahai-read-date):
* lisp/calendar/cal-menu.el (cal-menu-diary-menu)
(cal-menu-goto-menu):
* lisp/calendar/calendar.el (calendar-other-dates):
* lisp/calendar/holidays.el (holiday-islamic-holidays)
(holiday-bahai-holidays, list-holidays):
* lisp/org/org-agenda.el (org-agenda-convert-date):
Use better accents for Baháʼí wordsm in diagnostics etc.
Some problems still remain.  For example, because Emacs renders
the digraph “s͟h” in “Mas͟híyyat” almost as if it were “s_h” instead
of underlining the “s” and “h” as it should, just spell it
“Mashíyyat” for now.
---
 ChangeLog.2                 |  4 +-
 doc/emacs/ack.texi          |  2 +-
 doc/emacs/cal-xtra.texi     | 12 +++---
 doc/emacs/calendar.texi     | 10 ++---
 doc/emacs/docstyle.texi     |  8 +++-
 lisp/calendar/cal-bahai.el  | 82 ++++++++++++++++++-------------------
 lisp/calendar/cal-hebrew.el |  2 +-
 lisp/calendar/cal-menu.el   |  4 +-
 lisp/calendar/cal-tex.el    |  2 +-
 lisp/calendar/calendar.el   | 14 +++----
 lisp/calendar/diary-lib.el  |  6 +--
 lisp/calendar/holidays.el   | 18 ++++----
 lisp/org/org-agenda.el      |  2 +-
 13 files changed, 86 insertions(+), 80 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index 9e875c561d..0eb23cd5af 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -23396,7 +23396,7 @@
 	Go back to grave quoting in source-code docstrings etc.
 	This reverts almost all my recent changes to use curved quotes
 	in docstrings and/or strings used for error diagnostics.
-	There are a few exceptions, e.g., Bahá’í proper names.
+	There are a few exceptions, e.g., Baháʼí proper names.
 	* admin/unidata/unidata-gen.el (unidata-gen-table):
 	* lisp/abbrev.el (expand-region-abbrevs):
 	* lisp/align.el (align-region):
@@ -23922,7 +23922,7 @@
 	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
+	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):
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index c6224885df..26d3d84139 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1378,7 +1378,7 @@ Acknowledgments
 @file{align.el}, a set of commands for aligning text according to
 regular-expression based rules; @file{isearchb.el} for fast buffer
 switching; @file{timeclock.el}, a package for keeping track of time
-spent on projects; the Bahá'í calendar support; @file{pcomplete.el}, a
+spent on projects; the @value{Bahai} calendar support; @file{pcomplete.el}, a
 programmable completion facility; @file{remember.el}, a mode for
 jotting down things to remember; @file{eudcb-mab.el}, an address book
 backend for the Emacs Unified Directory Client; and @code{eshell}, a
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 3f1198987d..0faaed759f 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -202,7 +202,7 @@ Holiday Customizing
 @minus{}1 the last occurrence, @minus{}2 the second-to-last occurrence, and
 so on).
 
-  You can specify holidays that occur on fixed days of the Bahá'í,
+  You can specify holidays that occur on fixed days of the @value{Bahai},
 Chinese, Hebrew, Islamic, and Julian calendars too.  For example,
 
 @smallexample
@@ -513,7 +513,7 @@ Non-Gregorian Diary
 @subsection Diary Entries Using non-Gregorian Calendars
 
   As well as entries based on the standard Gregorian calendar, your
-diary can have entries based on Bahá'í, Chinese, Hebrew, or Islamic dates.
+diary can have entries based on @value{Bahai}, Chinese, Hebrew, or Islamic dates.
 Recognition of such entries can be time-consuming, however, and since
 most people don't use them, you must explicitly enable their use.  If
 you want the diary to recognize Hebrew-date diary entries, for example,
@@ -535,7 +535,7 @@ Non-Gregorian Diary
 @end smallexample
 
 @noindent
-Similarly, for Islamic, Bahá'í and Chinese entries, add
+Similarly, for Islamic, @value{Bahai} and Chinese entries, add
 @code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries},
 @code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries},
 or @code{diary-chinese-list-entries} and @code{diary-chinese-mark-entries}.
@@ -546,7 +546,7 @@ Non-Gregorian Diary
 @vindex diary-islamic-entry-symbol
   These diary entries have the same formats as Gregorian-date diary
 entries; except that @code{diary-bahai-entry-symbol} (default @samp{B})
-must precede a Bahá'í date, @code{diary-chinese-entry-symbol} (default
+must precede a @value{Bahai} date, @code{diary-chinese-entry-symbol} (default
 @samp{C}) a Chinese date, @code{diary-hebrew-entry-symbol} (default
 @samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default
 @samp{I}) an Islamic date.  Moreover, non-Gregorian month names may not
@@ -574,7 +574,7 @@ Non-Gregorian Diary
 
   Here is a table of commands used in the calendar to create diary
 entries that match the selected date and other dates that are similar in
-the Bahá'í, Chinese, Hebrew, or Islamic calendars:
+the @value{Bahai}, Chinese, Hebrew, or Islamic calendars:
 
 @table @kbd
 @item i h d
@@ -962,7 +962,7 @@ Sexp Diary Entries
 @item %%(diary-astro-day-number)
 Make a diary entry with today's equivalent astronomical (Julian) day number.
 @item %%(diary-bahai-date)
-Make a diary entry with today's equivalent Bahá'í calendar date.
+Make a diary entry with today's equivalent @value{Bahai} calendar date.
 @item %%(diary-chinese-date)
 Make a diary entry with today's equivalent Chinese calendar date.
 @item %%(diary-coptic-date)
diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi
index 8dc1a0b2df..b88c60678c 100644
--- a/doc/emacs/calendar.texi
+++ b/doc/emacs/calendar.texi
@@ -532,7 +532,7 @@ Holidays
 holidays}, which prompts for the month and year.
 
   The holidays known to Emacs include United States holidays and the
-major Bah@'{a}@t{'}@'{i}, Chinese, Christian, Islamic, and Jewish
+major @value{Bahai}, Chinese, Christian, Islamic, and Jewish
 holidays; also the solstices and equinoxes.
 
 @findex list-holidays
@@ -769,8 +769,8 @@ Calendar Systems
 twelve @dfn{terrestrial branches} for a total of sixty names that are
 repeated in a cycle of sixty.
 
-@cindex Bahá'í calendar
-  The Bahá'í calendar system is based on a solar cycle of 19 months with
+@cindex @value{Bahai} calendar
+  The @value{Bahai} calendar system is based on a solar cycle of 19 months with
 19 days each.  The four remaining intercalary days are placed
 between the 18th and 19th months.
 
@@ -810,7 +810,7 @@ To Other Calendar
 (@code{calendar-french-print-date}).
 @findex calendar-bahai-print-date
 @item p b
-Display Bahá'í date for selected day
+Display @value{Bahai} date for selected day
 (@code{calendar-bahai-print-date}).
 @findex calendar-chinese-print-date
 @item p C
@@ -877,7 +877,7 @@ From Other Calendar
 Move to a date specified with an astronomical (Julian) day number
 (@code{calendar-astro-goto-day-number}).
 @item g b
-Move to a date specified in the Bahá'í calendar
+Move to a date specified in the @value{Bahai} calendar
 (@code{calendar-bahai-goto-date}).
 @item g h
 Move to a date specified in the Hebrew calendar
diff --git a/doc/emacs/docstyle.texi b/doc/emacs/docstyle.texi
index 5bdcd079d9..4823ea2c10 100644
--- a/doc/emacs/docstyle.texi
+++ b/doc/emacs/docstyle.texi
@@ -1,4 +1,4 @@
-@c Emacs documentation style settings
+@c Emacs documentation style settings -*- coding: utf-8 -*-
 @documentencoding UTF-8
 @c These two require Texinfo 5.0 or later, so we use the older
 @c equivalent @set variables supported in 4.11 and hence
@@ -16,3 +16,9 @@
 @hyphenation{work-a-rounds}
 @hyphenation{un-marked}
 @end iftex
+@set Bahai Baháʼí
+@iftex
+@c TeX mishandles ʼ (U+02BC MODIFIER LETTER APOSTROPHE), so approximate
+@c it with ', which TeX renders as a right single quotation mark.
+@set Bahai Bahá'í
+@end iftex
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index b6bb040dd5..84ab8155f2 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-2020 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <[email-masked]>
 ;; Keywords: calendar
-;; Human-Keywords: Bahá’í calendar, Bahá’í, Baha'i, Bahai, calendar, diary
+;; Human-Keywords: Baháʼí, 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
@@ -42,7 +42,7 @@
 ;; Váhids.  A cycle of 19 Váhids (361 years) is called a Kullu-Shay,
 ;; which means "all things".
 
-;; The calendar was named the "Badí‘ calendar" by its author, the Báb.
+;; The calendar was named the "Badíʻ calendar" by its author, the Báb.
 ;; It uses a week of seven days, corresponding to the Gregorian week,
 ;; each of which has its own name, again patterned after the
 ;; attributes of God.
@@ -56,16 +56,16 @@
 (require 'calendar)
 
 (defconst calendar-bahai-month-name-array
-  ["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.")
+  ["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.")
 
 (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 @@ calendar-bahai-leap-base
 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 @@ calendar-bahai-to-absolute
        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 @@ calendar-bahai-from-absolute
 
 ;;;###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 @@ calendar-bahai-date-string
 
 ;;;###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 @@ calendar-bahai-read-date
          (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 @@ displayed-year
 
 ;;;###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 @@ holiday-bahai
          (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 @@ holiday-bahai
       ;; 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 @@ holiday-bahai
 
 ;;;###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 @@ holiday-bahai-ridvan
 
 ;;;###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 @@ diary-bahai-list-entries
 
 ;;;###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 @@ calendar-bahai-mark-date-pattern
 
 ;;;###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 @@ diary-bahai-mark-entries
 ;;;###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 @@ diary-bahai-insert-entry
 ;;;###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 @@ diary-bahai-insert-monthly-entry
 ;;;###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
@@ -322,8 +322,8 @@ diary-bahai-insert-yearly-entry
 
 ;;;###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 b8fbf65870..0e7462927b 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -611,7 +611,7 @@ calendar-hebrew-mark-date-pattern
   "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 Bahá’í 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 f4d46e6cdd..1163433d13 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -52,7 +52,7 @@ cal-menu-diary-menu
     ["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 @@ cal-menu-goto-menu
     ["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 ded065789f..80946492c8 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1621,7 +1621,7 @@ cal-tex-end-document
         (goto-char (point-min))
         (when (search-forward "documentclass" nil t)
           (forward-line 1)
-          ;; E.g., for some Bahá’í 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 1ae3944568..e70118e4e8 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
@@ -687,7 +687,7 @@ diary-file
 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
@@ -722,7 +722,7 @@ diary-islamic-entry-symbol
   :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)
 
@@ -1049,9 +1049,9 @@ calendar-islamic-all-holidays-flag
   :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)
@@ -2608,7 +2608,7 @@ calendar-other-dates
            (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 6d26208847..edbdd96cdc 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -306,7 +306,7 @@ diary-remind-message
 
 (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.
@@ -1559,7 +1559,7 @@ calendar-mark-date-pattern
         (calendar-mark-month m y month day year color)
         (calendar-increment-month m y 1)))))
 
-;; Bahá’í, 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.
@@ -1589,7 +1589,7 @@ calendar-mark-complex
            (calendar-mark-visible-date
             (calendar-gregorian-from-absolute date) color)))))
 
-;; Bahá’í, 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.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 182e99a611..c4b0e555fd 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -151,7 +151,7 @@ holiday-islamic-holidays
          (holiday-islamic 1 10 "Ashura")
          (holiday-islamic 3 12 "Mulad-al-Nabi")
          (holiday-islamic 7 26 "Shab-e-Mi'raj")
-         (holiday-islamic 8 15 "Shab-e-Bara't")
+         (holiday-islamic 8 15 "Shab-e-Barat")
          (holiday-islamic 9 27 "Shab-e Qadr")
          (holiday-islamic 10 1 "Id-al-Fitr")
          (holiday-islamic 12 10 "Id-al-Adha")))))
@@ -167,15 +167,15 @@ holiday-bahai-holidays
   '((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)
 ;;;###autoload
@@ -246,7 +246,7 @@ calendar-holidays
                                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
@@ -274,11 +274,11 @@ calendar-holidays
      (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\")
@@ -452,7 +452,7 @@ list-holidays
             (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/org/org-agenda.el b/lisp/org/org-agenda.el
index 4f89ea5450..2c18b01b9d 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -9996,7 +9996,7 @@ org-agenda-convert-date
 	     "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"
-	     "Bahá’í:     " (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"
-- 
2.17.1