aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-09-23 00:34:01 -0700
committerPaul Eggert2017-09-23 00:36:56 -0700
commitf2b2201594b59ff758347644a84cdc8f6b046ec9 (patch)
treea6e42ca28f5c4e95b101a8e2cf5a0758cf54dcac
parent0e143b1fc5d716cbc4509b416a1067b417df2676 (diff)
downloademacs-f2b2201594b59ff758347644a84cdc8f6b046ec9.tar.gz
emacs-f2b2201594b59ff758347644a84cdc8f6b046ec9.zip
; Spelling and URL fixes
-rw-r--r--ChangeLog.24
-rw-r--r--ChangeLog.38
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/calendar/cal-tex.el2
-rw-r--r--lisp/emacs-lisp/ert-x.el2
-rw-r--r--lisp/org/ChangeLog.14
-rw-r--r--test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el2
-rw-r--r--test/lisp/emacs-lisp/edebug-tests.el6
-rw-r--r--test/lisp/vc/smerge-mode-tests.el2
9 files changed, 16 insertions, 16 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2
index bd1800b3307..e789722a4d6 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -4808,7 +4808,7 @@
4808 Link from (emacs)Exiting to (lisp)Killing Emacs 4808 Link from (emacs)Exiting to (lisp)Killing Emacs
4809 4809
4810 * doc/emacs/entering.texi (Exiting): Link to the lispref 4810 * doc/emacs/entering.texi (Exiting): Link to the lispref
4811 manual for further customisations (bug#15445). 4811 manual for further customizations (bug#15445).
4812 4812
4813 (cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28) 4813 (cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28)
4814 4814
@@ -7845,7 +7845,7 @@
7845 7845
78462016-02-20 Lars Ingebrigtsen <larsi@gnus.org> 78462016-02-20 Lars Ingebrigtsen <larsi@gnus.org>
7847 7847
7848 Allow customising the article mode cursor behavior 7848 Allow customizing the article mode cursor behavior
7849 7849
7850 * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor. 7850 * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor.
7851 7851
diff --git a/ChangeLog.3 b/ChangeLog.3
index 9f43511991c..9e622cef90f 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -12949,7 +12949,7 @@
12949 Link from (emacs)Exiting to (lisp)Killing Emacs 12949 Link from (emacs)Exiting to (lisp)Killing Emacs
12950 12950
12951 * doc/emacs/entering.texi (Exiting): Link to the lispref 12951 * doc/emacs/entering.texi (Exiting): Link to the lispref
12952 manual for further customisations (bug#15445). 12952 manual for further customizations (bug#15445).
12953 12953
129542016-04-29 Lars Ingebrigtsen <larsi@gnus.org> 129542016-04-29 Lars Ingebrigtsen <larsi@gnus.org>
12955 12955
@@ -13159,7 +13159,7 @@
13159 Move the diff command to "Operate" in ibuffer 13159 Move the diff command to "Operate" in ibuffer
13160 13160
13161 * lisp/ibuffer.el (ibuffer-mode-operate-map): Move the diff 13161 * lisp/ibuffer.el (ibuffer-mode-operate-map): Move the diff
13162 command to the "Operate" menu, and remove the customisation 13162 command to the "Operate" menu, and remove the customization
13163 entry to make the "View" menu more logical (bug#1150). 13163 entry to make the "View" menu more logical (bug#1150).
13164 13164
131652016-04-27 Lars Ingebrigtsen <larsi@gnus.org> 131652016-04-27 Lars Ingebrigtsen <larsi@gnus.org>
@@ -16589,7 +16589,7 @@
16589 really changed. 16589 really changed.
16590 (save_window_save): Set the pixel_height_before_size_change and 16590 (save_window_save): Set the pixel_height_before_size_change and
16591 pixel_width_before_size_change fields. 16591 pixel_width_before_size_change fields.
16592 (Vwindow_size_change_functions): Move here definiton from xdisp.c. 16592 (Vwindow_size_change_functions): Move here definition from xdisp.c.
16593 * src/xdisp.c (prepare_menu_bars, redisplay_internal): Call 16593 * src/xdisp.c (prepare_menu_bars, redisplay_internal): Call
16594 run_window_size_change_functions. 16594 run_window_size_change_functions.
16595 (Vwindow_size_change_functions): Move definition to window.c. 16595 (Vwindow_size_change_functions): Move definition to window.c.
@@ -16842,7 +16842,7 @@
16842 5d17ae7 Improve file-notify-test08-watched-file-in-watched-dir 16842 5d17ae7 Improve file-notify-test08-watched-file-in-watched-dir
16843 1cb1268 Fix todo-mode item date editing bugs 16843 1cb1268 Fix todo-mode item date editing bugs
16844 1e996cf Fix "[:upper:]" for non-ASCII characters 16844 1e996cf Fix "[:upper:]" for non-ASCII characters
16845 896f993 Allow customising the article mode cursor behavior 16845 896f993 Allow customizing the article mode cursor behavior
16846 24c1c1d Use pop-to-buffer-same-window in woman.el 16846 24c1c1d Use pop-to-buffer-same-window in woman.el
16847 2a75f64 New filenotify test for bug#22736 16847 2a75f64 New filenotify test for bug#22736
16848 c9bccf7 Report critical battery errors 16848 c9bccf7 Report critical battery errors
diff --git a/etc/NEWS b/etc/NEWS
index 280ab64f37c..34561acae56 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1893,7 +1893,7 @@ of frame decorations on macOS 10.9+.
1893** Mousewheel and trackpad scrolling on macOS 10.7+ now behaves more 1893** Mousewheel and trackpad scrolling on macOS 10.7+ now behaves more
1894like the macOS default. The new variables 1894like the macOS default. The new variables
1895'ns-use-system-mwheel-acceleration', 'ns-touchpad-scroll-line-height' 1895'ns-use-system-mwheel-acceleration', 'ns-touchpad-scroll-line-height'
1896and 'ns-touchpad-use-momentum' can be used to customise the behavior. 1896and 'ns-touchpad-use-momentum' can be used to customize the behavior.
1897 1897
1898 1898
1899---------------------------------------------------------------------- 1899----------------------------------------------------------------------
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 72db03e5e60..1d295606f23 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -266,7 +266,7 @@ specified in ARGS. When ARGS is omitted, by default the option
266\"12pt,a4paper\" is passed. When ARGS has any other value, then 266\"12pt,a4paper\" is passed. When ARGS has any other value, then
267no option is passed to the class. 267no option is passed to the class.
268 268
269Insert the \"\\usepacakge{geometry}\" directive when ARGS 269Insert the \"\\usepackage{geometry}\" directive when ARGS
270contains the \"landscape\" string." 270contains the \"landscape\" string."
271 (set-buffer (generate-new-buffer cal-tex-buffer)) 271 (set-buffer (generate-new-buffer cal-tex-buffer))
272 (save-match-data 272 (save-match-data
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 5af5262e5da..71d46c11077 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -328,7 +328,7 @@ to the real `message'."
328 (funcall func "%s" msg))))) 328 (funcall func "%s" msg)))))
329 329
330(defun ert--make-print-advice (collector) 330(defun ert--make-print-advice (collector)
331 "Create around advice for print functions for `ert-collect-messsges'. 331 "Create around advice for print functions for `ert-collect-messages'.
332The created advice function will just call the original function 332The created advice function will just call the original function
333unless the output is going to the echo area (when PRINTCHARFUN is 333unless the output is going to the echo area (when PRINTCHARFUN is
334t or PRINTCHARFUN is nil and `standard-output' is t). If the 334t or PRINTCHARFUN is nil and `standard-output' is t). If the
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 366a3ee9fcd..ee50f6fb040 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -5015,10 +5015,10 @@
5015 * ox-latex.el (org-latex-listings): Update docstring. 5015 * ox-latex.el (org-latex-listings): Update docstring.
5016 5016
5017 * org-pcomplete.el (pcomplete/org-mode/file-option/options): 5017 * org-pcomplete.el (pcomplete/org-mode/file-option/options):
5018 Apply changes to export back-end definiton. 5018 Apply changes to export back-end definition.
5019 5019
5020 * org.el (org-get-export-keywords): Apply changes to export 5020 * org.el (org-get-export-keywords): Apply changes to export
5021 back-end definiton. 5021 back-end definition.
5022 5022
5023 * ox-html.el (org-html--format-toc-headline): Make use of 5023 * ox-html.el (org-html--format-toc-headline): Make use of
5024 anonymous back-ends. 5024 anonymous back-ends.
diff --git a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
index 0cc7b1e8b4e..f52a2b1896c 100644
--- a/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
+++ b/test/lisp/emacs-lisp/edebug-resources/edebug-test-code.el
@@ -17,7 +17,7 @@
17;; General Public License for more details. 17;; General Public License for more details.
18;; 18;;
19;; You should have received a copy of the GNU General Public License 19;; You should have received a copy of the GNU General Public License
20;; along with this program. If not, see `http://www.gnu.org/licenses/'. 20;; along with this program. If not, see <https://www.gnu.org/licenses/>.
21 21
22;;; Commentary: 22;;; Commentary:
23 23
diff --git a/test/lisp/emacs-lisp/edebug-tests.el b/test/lisp/emacs-lisp/edebug-tests.el
index 037278e772c..02f4d1c5abe 100644
--- a/test/lisp/emacs-lisp/edebug-tests.el
+++ b/test/lisp/emacs-lisp/edebug-tests.el
@@ -17,7 +17,7 @@
17;; General Public License for more details. 17;; General Public License for more details.
18;; 18;;
19;; You should have received a copy of the GNU General Public License 19;; You should have received a copy of the GNU General Public License
20;; along with this program. If not, see `http://www.gnu.org/licenses/'. 20;; along with this program. If not, see <https://www.gnu.org/licenses/>.
21 21
22;;; Commentary: 22;;; Commentary:
23 23
@@ -310,7 +310,7 @@ Then clear edebug-tests' saved messages."
310 (setq edebug-tests-messages "")) 310 (setq edebug-tests-messages ""))
311 311
312(defun edebug-tests-locate-def (def-name) 312(defun edebug-tests-locate-def (def-name)
313 "Search for a definiton of DEF-NAME from the start of the current buffer. 313 "Search for a definition of DEF-NAME from the start of the current buffer.
314Place point at the end of DEF-NAME in the buffer." 314Place point at the end of DEF-NAME in the buffer."
315 (goto-char (point-min)) 315 (goto-char (point-min))
316 (re-search-forward (concat "def\\S-+ edebug-test-code-" def-name))) 316 (re-search-forward (concat "def\\S-+ edebug-test-code-" def-name)))
@@ -584,7 +584,7 @@ test and possibly others should be updated."
584 584
585(ert-deftest edebug-tests-error-trying-to-set-breakpoint-in-uninstrumented-code 585(ert-deftest edebug-tests-error-trying-to-set-breakpoint-in-uninstrumented-code
586 () 586 ()
587 "Edebug refuses to set a breakpoint in uninsented code." 587 "Edebug refuses to set a breakpoint in uninstrumented code."
588 (edebug-tests-with-normal-env 588 (edebug-tests-with-normal-env
589 (edebug-tests-setup-@ "fac" '(5) t) 589 (edebug-tests-setup-@ "fac" '(5) t)
590 (let* ((debug-on-error nil) 590 (let* ((debug-on-error nil)
diff --git a/test/lisp/vc/smerge-mode-tests.el b/test/lisp/vc/smerge-mode-tests.el
index 204a4b93ab5..10d090632da 100644
--- a/test/lisp/vc/smerge-mode-tests.el
+++ b/test/lisp/vc/smerge-mode-tests.el
@@ -15,7 +15,7 @@
15;; GNU General Public License for more details. 15;; GNU General Public License for more details.
16 16
17;; You should have received a copy of the GNU General Public License 17;; You should have received a copy of the GNU General Public License
18;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
19 19
20;;; Code: 20;;; Code:
21 21