aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-01-09 22:20:22 -0800
committerPaul Eggert2012-01-09 22:20:22 -0800
commit27e428e758036e68bffe737a5d361e2b426857a7 (patch)
treed127e8bae3090e2e1c1fa0127e9f09c2703fe770
parent5b43da69cbda7874f223da3063da594a7fb84218 (diff)
downloademacs-27e428e758036e68bffe737a5d361e2b426857a7.tar.gz
emacs-27e428e758036e68bffe737a5d361e2b426857a7.zip
Spelling fixes.
-rw-r--r--doc/emacs/custom.texi2
-rw-r--r--doc/emacs/display.texi2
-rw-r--r--doc/misc/org.texi24
-rw-r--r--lisp/erc/ChangeLog.032
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--lisp/org/ob-fortran.el4
-rw-r--r--lisp/org/ob-latex.el2
-rw-r--r--lisp/org/ob-ledger.el2
-rw-r--r--lisp/org/org-agenda.el14
-rw-r--r--lisp/org/org-beamer.el4
-rw-r--r--lisp/org/org-capture.el4
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-compat.el2
-rw-r--r--lisp/org/org-ctags.el2
-rw-r--r--lisp/org/org-exp.el14
-rw-r--r--lisp/org/org-list.el8
-rw-r--r--lisp/org/org-lparse.el8
-rw-r--r--lisp/org/org-odt.el10
-rw-r--r--lisp/org/org-protocol.el4
-rw-r--r--lisp/org/org-publish.el4
-rw-r--r--lisp/org/org-table.el8
-rw-r--r--lisp/org/org-taskjuggler.el4
-rw-r--r--lisp/org/org.el12
-rw-r--r--lisp/progmodes/ada-xref.el2
-rw-r--r--lisp/progmodes/cc-fonts.el2
25 files changed, 72 insertions, 72 deletions
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 82a63996a64..b2215c19e75 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -141,7 +141,7 @@ previous button or editable field.
141 From the top-level customization buffer created by @kbd{M-x 141 From the top-level customization buffer created by @kbd{M-x
142customize}, you can follow the links to the subgroups of the 142customize}, you can follow the links to the subgroups of the
143@samp{Emacs} customization group. These subgroups may contain 143@samp{Emacs} customization group. These subgroups may contain
144settings for you to customize; they may also contain futher subgroups, 144settings for you to customize; they may also contain further subgroups,
145dealing with yet more specialized subsystems of Emacs. As you 145dealing with yet more specialized subsystems of Emacs. As you
146navigate the hierarchy of customization groups, you should find some 146navigate the hierarchy of customization groups, you should find some
147settings that you want to customize. 147settings that you want to customize.
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index b098f26eea5..e7d58c32290 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1078,7 +1078,7 @@ list):
1078@table @code 1078@table @code
1079@item face 1079@item face
1080Enable all visualizations which use special faces. This element has a 1080Enable all visualizations which use special faces. This element has a
1081special meaing: if it is absent from the list, none of the other 1081special meaning: if it is absent from the list, none of the other
1082visualizations take effect except @code{space-mark}, @code{tab-mark}, 1082visualizations take effect except @code{space-mark}, @code{tab-mark},
1083and @code{newline-mark}. 1083and @code{newline-mark}.
1084 1084
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index bc82e0ba7fe..4997a290cb7 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -36,7 +36,7 @@
36 36
37@c orgkey{key} A key item 37@c orgkey{key} A key item
38@c orgcmd{key,cmd} Key with command name 38@c orgcmd{key,cmd} Key with command name
39@c xorgcmd{key,cmmand} Key with command name as @itemx 39@c xorgcmd{key,cmd} Key with command name as @itemx
40@c orgcmdnki{key,cmd} Like orgcmd, but do not index the key 40@c orgcmdnki{key,cmd} Like orgcmd, but do not index the key
41@c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key 41@c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key
42@c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or" 42@c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or"
@@ -1004,8 +1004,8 @@ from within Emacs, please copy and paste the content into your Email program.
1004 1004
1005Sometimes you might face a problem due to an error in your Emacs or Org mode 1005Sometimes you might face a problem due to an error in your Emacs or Org mode
1006setup. Before reporting a bug, it is very helpful to start Emacs with minimal 1006setup. Before reporting a bug, it is very helpful to start Emacs with minimal
1007customisations and reproduce the problem. Doing so often helps you determine 1007customizations and reproduce the problem. Doing so often helps you determine
1008if the problem is with your customisation or with Org mode itself. You can 1008if the problem is with your customization or with Org mode itself. You can
1009start a typical minimal session with a command like the example below. 1009start a typical minimal session with a command like the example below.
1010 1010
1011@example 1011@example
@@ -1241,7 +1241,7 @@ Reveal context around point, showing the current entry, the following heading
1241and the hierarchy above. Useful for working near a location that has been 1241and the hierarchy above. Useful for working near a location that has been
1242exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command 1242exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
1243(@pxref{Agenda commands}). With a prefix argument show, on each 1243(@pxref{Agenda commands}). With a prefix argument show, on each
1244level, all sibling headings. With a double prefix argument, also show the 1244level, all sibling headings. With a double prefix argument, also show the
1245entire subtree of the parent. 1245entire subtree of the parent.
1246@orgcmd{C-c C-k,show-branches} 1246@orgcmd{C-c C-k,show-branches}
1247Expose all the headings of the subtree, CONTENT view for just one subtree. 1247Expose all the headings of the subtree, CONTENT view for just one subtree.
@@ -3943,7 +3943,7 @@ special faces for some of them. This can be done using the variable
3943@end lisp 3943@end lisp
3944 3944
3945While using a list with face properties as shown for CANCELED @emph{should} 3945While using a list with face properties as shown for CANCELED @emph{should}
3946work, this does not aways seem to be the case. If necessary, define a 3946work, this does not always seem to be the case. If necessary, define a
3947special face and use that. A string is interpreted as a color. The variable 3947special face and use that. A string is interpreted as a color. The variable
3948@code{org-faces-easy-properties} determines if that color is interpreted as a 3948@code{org-faces-easy-properties} determines if that color is interpreted as a
3949foreground or a background color. 3949foreground or a background color.
@@ -4427,7 +4427,7 @@ off a box while there are unchecked boxes above it.
4427 4427
4428@table @kbd 4428@table @kbd
4429@orgcmd{C-c C-c,org-toggle-checkbox} 4429@orgcmd{C-c C-c,org-toggle-checkbox}
4430Toggle checkbox status or (with prefix arg) checkbox presence at point. 4430Toggle checkbox status or (with prefix arg) checkbox presence at point.
4431With a single prefix argument, add an empty checkbox or remove the current 4431With a single prefix argument, add an empty checkbox or remove the current
4432one@footnote{`C-u C-c C-c' on the @emph{first} item of a list with no checkbox 4432one@footnote{`C-u C-c C-c' on the @emph{first} item of a list with no checkbox
4433will add checkboxes to the rest of the list.}. With a double prefix argument, set it to @samp{[-]}, which is 4433will add checkboxes to the rest of the list.}. With a double prefix argument, set it to @samp{[-]}, which is
@@ -6326,7 +6326,7 @@ not started at exactly the right moment.
6326@kindex ; 6326@kindex ;
6327 6327
6328Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown 6328Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown
6329timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else. 6329timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else.
6330 6330
6331@code{org-timer-set-timer} prompts the user for a duration and displays a 6331@code{org-timer-set-timer} prompts the user for a duration and displays a
6332countdown timer in the modeline. @code{org-timer-default-timer} sets the 6332countdown timer in the modeline. @code{org-timer-default-timer} sets the
@@ -9549,7 +9549,7 @@ broad range of other applications. @LaTeX{} export lets you use Org mode and
9549its structured editing functions to easily create @LaTeX{} files. DocBook 9549its structured editing functions to easily create @LaTeX{} files. DocBook
9550export makes it possible to convert Org files to many other formats using 9550export makes it possible to convert Org files to many other formats using
9551DocBook tools. OpenDocument Text(@acronym{ODT}) export allows seamless 9551DocBook tools. OpenDocument Text(@acronym{ODT}) export allows seamless
9552colloboration across organizational boundaries. For project management you 9552collaboration across organizational boundaries. For project management you
9553can create gantt and resource charts by using TaskJuggler export. To 9553can create gantt and resource charts by using TaskJuggler export. To
9554incorporate entries with associated times like deadlines or appointments into 9554incorporate entries with associated times like deadlines or appointments into
9555a desktop calendar program like iCal, Org mode can also produce extracts in 9555a desktop calendar program like iCal, Org mode can also produce extracts in
@@ -10998,9 +10998,9 @@ You can control the size and scale of the embedded images using the
10998 10998
10999@vindex org-export-odt-pixels-per-inch 10999@vindex org-export-odt-pixels-per-inch
11000Note that the exporter specifies the desired size of the image in the final 11000Note that the exporter specifies the desired size of the image in the final
11001document in units of centimetres. In order to scale the embedded images, the 11001document in units of centimeters. In order to scale the embedded images, the
11002exporter needs to compute the size of the image. This is done by retrieving 11002exporter needs to compute the size of the image. This is done by retrieving
11003the image size in pixels and converting the pixel units to centimetres using 11003the image size in pixels and converting the pixel units to centimeters using
11004@code{org-export-odt-pixels-per-inch}. The default value of this variable is 11004@code{org-export-odt-pixels-per-inch}. The default value of this variable is
11005set to @code{display-pixels-per-inch}. You can tweak this variable to 11005set to @code{display-pixels-per-inch}. You can tweak this variable to
11006achieve the best results. 11006achieve the best results.
@@ -12629,7 +12629,7 @@ that code is only evaluated after explicit confirmation from the user. For
12629information on these safeguards (and on how to disable them) see @ref{Code 12629information on these safeguards (and on how to disable them) see @ref{Code
12630evaluation security}.} and the results of evaluation optionally placed in the 12630evaluation security}.} and the results of evaluation optionally placed in the
12631Org mode buffer. By default, the evaluation facility is only enabled for 12631Org mode buffer. By default, the evaluation facility is only enabled for
12632Lisp code blocks specified as @code{emacs-lisp}. However, souce code blocks 12632Lisp code blocks specified as @code{emacs-lisp}. However, source code blocks
12633in many languages can be evaluated within Org mode (see @ref{Languages} for a 12633in many languages can be evaluated within Org mode (see @ref{Languages} for a
12634list of supported languages and @ref{Structure of code blocks} for 12634list of supported languages and @ref{Structure of code blocks} for
12635information on the syntax used to define a code block). 12635information on the syntax used to define a code block).
@@ -16434,7 +16434,7 @@ chapter about publishing.
16434@i{Jambunathan K} contributed the @acronym{ODT} exporter. 16434@i{Jambunathan K} contributed the @acronym{ODT} exporter.
16435@item 16435@item
16436@i{Sebastien Vauban} reported many issues with @LaTeX{} and BEAMER export and 16436@i{Sebastien Vauban} reported many issues with @LaTeX{} and BEAMER export and
16437enabled source code highlighling in Gnus. 16437enabled source code highlighting in Gnus.
16438@item 16438@item
16439@i{Stefan Vollmar} organized a video-recorded talk at the 16439@i{Stefan Vollmar} organized a video-recorded talk at the
16440Max-Planck-Institute for Neurology. He also inspired the creation of a 16440Max-Planck-Institute for Neurology. He also inspired the creation of a
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 87f30c8965a..f9b4506b784 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -200,7 +200,7 @@
200 200
201 * erc-autoaway.el(erc-mode): 201 * erc-autoaway.el(erc-mode):
202 Reset idletime on connect. Fixes an annoying bug which 202 Reset idletime on connect. Fixes an annoying bug which
203 flooded the server with aways on reconnect. 203 flooded the server with always on reconnect.
204 (erc-autoway-reset-idletime): Accept optional args so we can hook it 204 (erc-autoway-reset-idletime): Accept optional args so we can hook it
205 onto erc-server-001-hook. 205 onto erc-server-001-hook.
206 206
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 983df8a6bfc..961f3fdd4e0 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1749,7 +1749,7 @@
1749 1749
17502012-01-03 Suvayu Ali <fatkasuvayu+linux@gmail.com> (tiny change) 17502012-01-03 Suvayu Ali <fatkasuvayu+linux@gmail.com> (tiny change)
1751 1751
1752 * org-inlinetask.el (org-inlinetask): New customisable face 1752 * org-inlinetask.el (org-inlinetask): New customizable face
1753 for inlinetasks 1753 for inlinetasks
1754 1754
17552012-01-03 Bastien Guerry <bzg@gnu.org> 17552012-01-03 Bastien Guerry <bzg@gnu.org>
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index b6305c42769..46d2269a1d7 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -110,7 +110,7 @@ it's header arguments."
110 "Wrap body in a \"program ... end program\" block if none exists." 110 "Wrap body in a \"program ... end program\" block if none exists."
111 (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body)) 111 (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
112 (let ((vars (mapcar #'cdr (org-babel-get-header params :var)))) 112 (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
113 (if vars (error "cannot use :vars if 'program' statment is present")) 113 (if vars (error "cannot use :vars if 'program' statement is present"))
114 body) 114 body)
115 (format "program main\n%s\nend program main\n" body))) 115 (format "program main\n%s\nend program main\n" body)))
116 116
@@ -127,7 +127,7 @@ support for sessions"
127;; helper functions 127;; helper functions
128 128
129(defun org-babel-fortran-var-to-fortran (pair) 129(defun org-babel-fortran-var-to-fortran (pair)
130 "fortranonvert an elisp val into a string of fortran code specifying a var 130 "Convert an elisp val into a string of fortran code specifying a var
131of the same value." 131of the same value."
132 ;; TODO list support 132 ;; TODO list support
133 (let ((var (car pair)) 133 (let ((var (car pair))
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 0db71992826..23e8d91fecd 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -132,7 +132,7 @@ This function is called by `org-babel-execute-src-block'."
132 (when (file-exists-p transient-pdf-file) 132 (when (file-exists-p transient-pdf-file)
133 (delete-file transient-pdf-file)))))) 133 (delete-file transient-pdf-file))))))
134 ((string-match "\\.\\([^\\.]+\\)$" out-file) 134 ((string-match "\\.\\([^\\.]+\\)$" out-file)
135 (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header arguement" 135 (error "can not create %s files, please specify a .png or .pdf file or try the :imagemagick header argument"
136 (match-string 1 out-file)))) 136 (match-string 1 out-file))))
137 nil) ;; signal that output has already been written to file 137 nil) ;; signal that output has already been written to file
138 body)) 138 body))
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index e9c142712eb..a454d51e391 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -29,7 +29,7 @@
29;; 29;;
30;; 1) there is no such thing as a "session" in ledger 30;; 1) there is no such thing as a "session" in ledger
31;; 31;;
32;; 2) we are generally only going to return output from the leger program 32;; 2) we are generally only going to return output from the ledger program
33;; 33;;
34;; 3) we are adding the "cmdline" header argument 34;; 3) we are adding the "cmdline" header argument
35;; 35;;
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d444aff4f2b..bdf68819089 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -28,7 +28,7 @@
28;; 28;;
29;; The functions `org-batch-agenda', `org-batch-agenda-csv', and 29;; The functions `org-batch-agenda', `org-batch-agenda-csv', and
30;; `org-batch-store-agenda-views' are implemented as macros to provide 30;; `org-batch-store-agenda-views' are implemented as macros to provide
31;; a conveniant way for extracting agenda information from the command 31;; a convenient way for extracting agenda information from the command
32;; line. The Lisp does not evaluate parameters of a macro call; thus 32;; line. The Lisp does not evaluate parameters of a macro call; thus
33;; it is not necessary to quote the parameters passed to one of those 33;; it is not necessary to quote the parameters passed to one of those
34;; functions. E.g. you can write: 34;; functions. E.g. you can write:
@@ -1088,7 +1088,7 @@ and timeline buffers."
1088 (const :tag "Sunday" 0))) 1088 (const :tag "Sunday" 0)))
1089 1089
1090(defcustom org-agenda-move-date-from-past-immediately-to-today t 1090(defcustom org-agenda-move-date-from-past-immediately-to-today t
1091 "Non-nil means jumpt to today when moving a past date forward in time. 1091 "Non-nil means jump to today when moving a past date forward in time.
1092When using S-right in the agenda to move a a date forward, and the date 1092When using S-right in the agenda to move a a date forward, and the date
1093stamp currently points to the past, the first key press will move it 1093stamp currently points to the past, the first key press will move it
1094to today. WHen nil, just move one day forward even if the date stays 1094to today. WHen nil, just move one day forward even if the date stays
@@ -1660,7 +1660,7 @@ Where CATEGORY-REGEXP is a regexp matching the categories where
1660the icon should be displayed. 1660the icon should be displayed.
1661FILE-OR-DATA either a file path or a string containing image data. 1661FILE-OR-DATA either a file path or a string containing image data.
1662 1662
1663The other fields can be omited safely if not needed: 1663The other fields can be omitted safely if not needed:
1664TYPE indicates the image type. 1664TYPE indicates the image type.
1665DATA-P is a boolean indicating whether the FILE-OR-DATA string is 1665DATA-P is a boolean indicating whether the FILE-OR-DATA string is
1666image data. 1666image data.
@@ -3064,7 +3064,7 @@ define a filter for one of the individual blocks. You need to set it in
3064the global options and expect it to be applied to the entire view.") 3064the global options and expect it to be applied to the entire view.")
3065 3065
3066(defvar org-agenda-category-filter-preset nil 3066(defvar org-agenda-category-filter-preset nil
3067 "A preset of the categeory filter used for secondary agenda filtering. 3067 "A preset of the category filter used for secondary agenda filtering.
3068This must be a list of strings, each string must be a single category 3068This must be a list of strings, each string must be a single category
3069preceded by \"+\" or \"-\". 3069preceded by \"+\" or \"-\".
3070This variable should not be set directly, but agenda custom commands can 3070This variable should not be set directly, but agenda custom commands can
@@ -4922,7 +4922,7 @@ DAYNAME is a number between 0 (Sunday) and 6 (Saturday).
4922SKIP-WEEKS is any number of ISO weeks in the block period for which the 4922SKIP-WEEKS is any number of ISO weeks in the block period for which the
4923item should be skipped. If any of the SKIP-WEEKS arguments is the symbol 4923item should be skipped. If any of the SKIP-WEEKS arguments is the symbol
4924`holidays', then any date that is known by the Emacs calendar to be a 4924`holidays', then any date that is known by the Emacs calendar to be a
4925holidy will also be skipped." 4925holiday will also be skipped."
4926 (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1))) 4926 (let* ((date1 (calendar-absolute-from-gregorian (list m1 d1 y1)))
4927 (date2 (calendar-absolute-from-gregorian (list m2 d2 y2))) 4927 (date2 (calendar-absolute-from-gregorian (list m2 d2 y2)))
4928 (d (calendar-absolute-from-gregorian date))) 4928 (d (calendar-absolute-from-gregorian date)))
@@ -8507,7 +8507,7 @@ tag and (if present) the flagging note."
8507 (org-agenda-remove-flag hdmarker) 8507 (org-agenda-remove-flag hdmarker)
8508 (let ((win (get-buffer-window "*Flagging Note*"))) 8508 (let ((win (get-buffer-window "*Flagging Note*")))
8509 (and win (delete-window win))) 8509 (and win (delete-window win)))
8510 (message "Entry unflaged")) 8510 (message "Entry unflagged"))
8511 (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE")) 8511 (setq note (org-entry-get hdmarker "THEFLAGGINGNOTE"))
8512 (unless note 8512 (unless note
8513 (error "No flagging note")) 8513 (error "No flagging note"))
@@ -8530,7 +8530,7 @@ tag and (if present) the flagging note."
8530 (org-entry-delete nil "THEFLAGGINGNOTE") 8530 (org-entry-delete nil "THEFLAGGINGNOTE")
8531 (setq newhead (org-get-heading))) 8531 (setq newhead (org-get-heading)))
8532 (org-agenda-change-all-lines newhead marker) 8532 (org-agenda-change-all-lines newhead marker)
8533 (message "Entry unflaged"))) 8533 (message "Entry unflagged")))
8534 8534
8535(defun org-agenda-get-any-marker (&optional pos) 8535(defun org-agenda-get-any-marker (&optional pos)
8536 (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker) 8536 (or (get-text-property (or pos (point-at-bol)) 'org-hd-marker)
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 0a402ed4038..28b79a03dfe 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -410,7 +410,7 @@ the value will be inserted right after the documentclass statement."
410 410
411 411
412;; Functions to initialize and post-process 412;; Functions to initialize and post-process
413;; These fuctions will be hooked into various places in the export process 413;; These functions will be hooked into various places in the export process
414 414
415(defun org-beamer-initialize-open-trackers () 415(defun org-beamer-initialize-open-trackers ()
416 "Reset variables that track if certain environments are open during export." 416 "Reset variables that track if certain environments are open during export."
@@ -450,7 +450,7 @@ The effect is that these values will be accessible during export."
450 ((stringp org-beamer-frame-level-now) 450 ((stringp org-beamer-frame-level-now)
451 (setq org-beamer-frame-level-now 451 (setq org-beamer-frame-level-now
452 (string-to-number org-beamer-frame-level-now)))) 452 (string-to-number org-beamer-frame-level-now))))
453 ;; Find the header additons, most likely theme commands 453 ;; Find the header additions, most likely theme commands
454 (setq org-beamer-header-extra 454 (setq org-beamer-header-extra
455 (or (and (org-region-active-p) 455 (or (and (org-region-active-p)
456 (save-excursion 456 (save-excursion
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 46202f8adea..31694d47bc0 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -374,7 +374,7 @@ to avoid conflicts with other active capture processes."
374 (plist-get (if local org-capture-current-plist org-capture-plist) prop)) 374 (plist-get (if local org-capture-current-plist org-capture-plist) prop))
375 375
376(defun org-capture-member (prop &optional local) 376(defun org-capture-member (prop &optional local)
377 "Is PROP a preperty in `org-capture-plist'. 377 "Is PROP a property in `org-capture-plist'.
378When LOCAL is set, use the local variable `org-capture-current-plist', 378When LOCAL is set, use the local variable `org-capture-current-plist',
379this is necessary after initialization of the capture process, 379this is necessary after initialization of the capture process,
380to avoid conflicts with other active capture processes." 380to avoid conflicts with other active capture processes."
@@ -1455,7 +1455,7 @@ The template may still contain \"%?\" for cursor positioning."
1455 (goto-char (point-min)) 1455 (goto-char (point-min))
1456 (while (looking-at "[ \t]*\n") (replace-match "")) 1456 (while (looking-at "[ \t]*\n") (replace-match ""))
1457 (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n")) 1457 (if (re-search-forward "[ \t\n]*\\'" nil t) (replace-match "\n"))
1458 ;; Return the expanded tempate and kill the temporary buffer 1458 ;; Return the expanded template and kill the temporary buffer
1459 (untabify (point-min) (point-max)) 1459 (untabify (point-min) (point-max))
1460 (set-buffer-modified-p nil) 1460 (set-buffer-modified-p nil)
1461 (prog1 (buffer-string) (kill-buffer (current-buffer)))))) 1461 (prog1 (buffer-string) (kill-buffer (current-buffer))))))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 2784707e452..6211ae45b1b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2128,7 +2128,7 @@ the currently selected interval size."
2128 "Write out a clock table at position IPOS in the current buffer. 2128 "Write out a clock table at position IPOS in the current buffer.
2129TABLES is a list of tables with clocking data as produced by 2129TABLES is a list of tables with clocking data as produced by
2130`org-clock-get-table-data'. PARAMS is the parameter property list obtained 2130`org-clock-get-table-data'. PARAMS is the parameter property list obtained
2131from the dynamic block defintion." 2131from the dynamic block definition."
2132 ;; This function looks quite complicated, mainly because there are a 2132 ;; This function looks quite complicated, mainly because there are a
2133 ;; lot of options which can add or remove columns. I have massively 2133 ;; lot of options which can add or remove columns. I have massively
2134 ;; commented this function, the I hope it is understandable. If 2134 ;; commented this function, the I hope it is understandable. If
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 425e8d816c7..7c969375a7f 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -275,7 +275,7 @@ Works on both Emacs and XEmacs."
275 nil)) 275 nil))
276 276
277(defmacro org-xemacs-without-invisibility (&rest body) 277(defmacro org-xemacs-without-invisibility (&rest body)
278 "Turn off exents with invisibility while executing BODY." 278 "Turn off extents with invisibility while executing BODY."
279 `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 279 `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
280 'all-extents-closed-open 'invisible)) 280 'all-extents-closed-open 'invisible))
281 ext-inv-specs) 281 ext-inv-specs)
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index 7cbd299782f..ea94d419957 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -35,7 +35,7 @@
35;; links to these 'tagged' destinations, allowing seamless navigation between 35;; links to these 'tagged' destinations, allowing seamless navigation between
36;; multiple org-mode files. Topics can be created in any org mode file and 36;; multiple org-mode files. Topics can be created in any org mode file and
37;; will always be found by plain links from other files. Other file types 37;; will always be found by plain links from other files. Other file types
38;; recognised by ctags (source code files, latex files, etc) will also be 38;; recognized by ctags (source code files, latex files, etc) will also be
39;; available as destinations for plain links, and similarly, org-mode links 39;; available as destinations for plain links, and similarly, org-mode links
40;; will be available as tags from source files. Finally, the function 40;; will be available as tags from source files. Finally, the function
41;; `org-ctags-find-tag-interactive' lets you choose any known tag, using 41;; `org-ctags-find-tag-interactive' lets you choose any known tag, using
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 49da40f5f4f..c7e1a94216e 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -2800,7 +2800,7 @@ continue numbering from the last numbered block.
2800REPLACE-LABELS is dual-purpose. 2800REPLACE-LABELS is dual-purpose.
28011. It controls the retention of labels in the exported block. 28011. It controls the retention of labels in the exported block.
28022. It specifies in what manner the links (or references) to a 28022. It specifies in what manner the links (or references) to a
2803 labelled line be formatted. 2803 labeled line be formatted.
2804 2804
2805REPLACE-LABELS is the symbol `keep' if the literal example 2805REPLACE-LABELS is the symbol `keep' if the literal example
2806specifies \"-k\" option, is numeric if the literal example 2806specifies \"-k\" option, is numeric if the literal example
@@ -2808,12 +2808,12 @@ specifies \"-r\" option and is nil otherwise.
2808 2808
2809Handle REPLACE-LABELS as below: 2809Handle REPLACE-LABELS as below:
2810- If nil, retain labels in the exported block and use 2810- If nil, retain labels in the exported block and use
2811 user-provided labels for referencing the labelled lines. 2811 user-provided labels for referencing the labeled lines.
2812- If it is a number, remove labels in the exported block and use 2812- If it is a number, remove labels in the exported block and use
2813 one of line numbers or labels for referencing labelled lines based 2813 one of line numbers or labels for referencing labeled lines based
2814 on NUMBER option. 2814 on NUMBER option.
2815- If it is a keep, retain labels in the exported block and use 2815- If it is a keep, retain labels in the exported block and use
2816 one of line numbers or labels for referencing labelled lines 2816 one of line numbers or labels for referencing labeled lines
2817 based on NUMBER option. 2817 based on NUMBER option.
2818 2818
2819LABEL-FORMAT is the value of \"-l\" switch associated with 2819LABEL-FORMAT is the value of \"-l\" switch associated with
@@ -2823,8 +2823,8 @@ PREPROCESS is intended for backend-agnostic handling of source
2823block numbering. When non-nil do the following: 2823block numbering. When non-nil do the following:
2824- do not number the lines 2824- do not number the lines
2825- always strip the labels from exported block 2825- always strip the labels from exported block
2826- do not make the labelled line a target of an incoming link. 2826- do not make the labeled line a target of an incoming link.
2827 Instead mark the labelled line with `org-coderef' property and 2827 Instead mark the labeled line with `org-coderef' property and
2828 store the label in it." 2828 store the label in it."
2829 (setq skip1 (or skip1 0) skip2 (or skip2 0)) 2829 (setq skip1 (or skip1 0) skip2 (or skip2 0))
2830 (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0)) 2830 (if (and number (not cont)) (setq org-export-last-code-line-counter-value 0))
@@ -3021,7 +3021,7 @@ to the value of `temporary-file-directory'."
3021 (org-load-modules-maybe) 3021 (org-load-modules-maybe)
3022 (unless org-local-vars 3022 (unless org-local-vars
3023 (setq org-local-vars (org-get-local-variables))) 3023 (setq org-local-vars (org-get-local-variables)))
3024 (eval ;; convert to fmt -- mimicing `org-run-like-in-org-mode' 3024 (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
3025 (list 'let org-local-vars 3025 (list 'let org-local-vars
3026 (list (intern (format "org-export-as-%s" fmt)) 3026 (list (intern (format "org-export-as-%s" fmt))
3027 nil nil nil ''string t)))) 3027 nil nil nil ''string t))))
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index b36167701b4..da8a810895c 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -71,7 +71,7 @@
71;; few thousand lines long). Thus, code should follow the rule: 71;; few thousand lines long). Thus, code should follow the rule:
72;; "collect once, use many". As a corollary, it is usually a bad idea 72;; "collect once, use many". As a corollary, it is usually a bad idea
73;; to use directly an interactive function inside the code, as those, 73;; to use directly an interactive function inside the code, as those,
74;; being independant entities, read the whole list structure another 74;; being independent entities, read the whole list structure another
75;; time. 75;; time.
76 76
77;;; Code: 77;;; Code:
@@ -685,7 +685,7 @@ Assume point is at an item."
685 (cond 685 (cond
686 ((<= (point) lim-up) 686 ((<= (point) lim-up)
687 ;; At upward limit: if we ended at an item, store it, 687 ;; At upward limit: if we ended at an item, store it,
688 ;; else dimiss useless data recorded above BEG-CELL. 688 ;; else dismiss useless data recorded above BEG-CELL.
689 ;; Jump to part 2. 689 ;; Jump to part 2.
690 (throw 'exit 690 (throw 'exit
691 (setq itm-lst 691 (setq itm-lst
@@ -2674,7 +2674,7 @@ If a region is active, all items inside will be moved."
2674(defvar org-tab-ind-state) 2674(defvar org-tab-ind-state)
2675(defun org-cycle-item-indentation () 2675(defun org-cycle-item-indentation ()
2676 "Cycle levels of indentation of an empty item. 2676 "Cycle levels of indentation of an empty item.
2677The first run indents the item, if applicable. Subsequents runs 2677The first run indents the item, if applicable. Subsequent runs
2678outdent it at meaningful levels in the list. When done, item is 2678outdent it at meaningful levels in the list. When done, item is
2679put back at its original position with its original bullet. 2679put back at its original position with its original bullet.
2680 2680
@@ -3047,7 +3047,7 @@ Valid parameters PARAMS are:
3047 3047
3048Alternatively, each parameter can also be a form returning 3048Alternatively, each parameter can also be a form returning
3049a string. These sexp can use keywords `counter' and `depth', 3049a string. These sexp can use keywords `counter' and `depth',
3050reprensenting respectively counter associated to the current 3050representing respectively counter associated to the current
3051item, and depth of the current sub-list, starting at 0. 3051item, and depth of the current sub-list, starting at 0.
3052Obviously, `counter' is only available for parameters applying to 3052Obviously, `counter' is only available for parameters applying to
3053items." 3053items."
diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el
index b13dc86e5a6..229135e9b50 100644
--- a/lisp/org/org-lparse.el
+++ b/lisp/org/org-lparse.el
@@ -854,7 +854,7 @@ version."
854 (throw 'nextline nil)) 854 (throw 'nextline nil))
855 855
856 ;; Notes: The baseline version of org-html.el (git commit 856 ;; Notes: The baseline version of org-html.el (git commit
857 ;; 3d802e), while encoutering a *line-long* protected text, 857 ;; 3d802e), while encountering a *line-long* protected text,
858 ;; does one of the following two things based on the state 858 ;; does one of the following two things based on the state
859 ;; of the export buffer. 859 ;; of the export buffer.
860 860
@@ -869,10 +869,10 @@ version."
869 ;; I think ---> 869 ;; I think --->
870 870
871 ;; Scenario 1 mentioned above kicks in when a block of 871 ;; Scenario 1 mentioned above kicks in when a block of
872 ;; protected text has to be inserted enbloc. For example, 872 ;; protected text has to be inserted en bloc. For example,
873 ;; this happens, when inserting an source or example block 873 ;; this happens, when inserting an source or example block
874 ;; or preformatted content enclosed in #+backend, 874 ;; or preformatted content enclosed in #+backend,
875 ;; #+begin_bakend ... #+end_backend) 875 ;; #+begin_backend ... #+end_backend)
876 876
877 ;; Scenario 2 mentioned above kicks in when the protected 877 ;; Scenario 2 mentioned above kicks in when the protected
878 ;; text is part of a running sentence. For example this 878 ;; text is part of a running sentence. For example this
@@ -1189,7 +1189,7 @@ version."
1189 (t (current-buffer)))))) 1189 (t (current-buffer))))))
1190 1190
1191(defun org-lparse-format-table (lines olines) 1191(defun org-lparse-format-table (lines olines)
1192 "Retuns backend-specific code for org-type and table-type tables." 1192 "Returns backend-specific code for org-type and table-type tables."
1193 (if (stringp lines) 1193 (if (stringp lines)
1194 (setq lines (org-split-string lines "\n"))) 1194 (setq lines (org-split-string lines "\n")))
1195 (if (string-match "^[ \t]*|" (car lines)) 1195 (if (string-match "^[ \t]*|" (car lines))
diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el
index 886efa014f3..c8fa7ea363b 100644
--- a/lisp/org/org-odt.el
+++ b/lisp/org/org-odt.el
@@ -284,7 +284,7 @@ FILE-MEMBERS.
284Use options 1, 2 or 3 only if styles.xml alone suffices for 284Use options 1, 2 or 3 only if styles.xml alone suffices for
285achieving the desired formatting. Use option 4, if the styles.xml 285achieving the desired formatting. Use option 4, if the styles.xml
286references additional files like header and footer images for 286references additional files like header and footer images for
287achieving the desired formattting. 287achieving the desired formatting.
288 288
289Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on 289Use \"#+ODT_STYLES_FILE: ...\" directive to set this variable on
290a per-file basis. For example, 290a per-file basis. For example,
@@ -1878,7 +1878,7 @@ ATTR is a string of other attributes of the a element."
1878 (cons width height))) 1878 (cons width height)))
1879 1879
1880(defvar org-odt-entity-labels-alist nil 1880(defvar org-odt-entity-labels-alist nil
1881 "Associate Labels with the Labelled entities. 1881 "Associate Labels with the Labeled entities.
1882Each element of the alist is of the form (LABEL-NAME 1882Each element of the alist is of the form (LABEL-NAME
1883CATEGORY-NAME SEQNO LABEL-STYLE-NAME). LABEL-NAME is same as 1883CATEGORY-NAME SEQNO LABEL-STYLE-NAME). LABEL-NAME is same as
1884that specified by \"#+LABEL: ...\" line. CATEGORY-NAME is the 1884that specified by \"#+LABEL: ...\" line. CATEGORY-NAME is the
@@ -2213,7 +2213,7 @@ visually."
2213 (with-current-buffer 2213 (with-current-buffer
2214 (find-file-noselect (expand-file-name "styles.xml") t) 2214 (find-file-noselect (expand-file-name "styles.xml") t)
2215 ;; Don't make automatic backup of styles.xml file. This setting 2215 ;; Don't make automatic backup of styles.xml file. This setting
2216 ;; prevents the backedup styles.xml file from being zipped in to 2216 ;; prevents the backed-up styles.xml file from being zipped in to
2217 ;; odt file. This is more of a hackish fix. Better alternative 2217 ;; odt file. This is more of a hackish fix. Better alternative
2218 ;; would be to fix the zip command so that the output odt file 2218 ;; would be to fix the zip command so that the output odt file
2219 ;; includes only the needed files and excludes any auto-generated 2219 ;; includes only the needed files and excludes any auto-generated
@@ -2228,7 +2228,7 @@ visually."
2228 (org-odt-configure-outline-numbering 2228 (org-odt-configure-outline-numbering
2229 (if org-export-with-section-numbers org-export-headline-levels 0))) 2229 (if org-export-with-section-numbers org-export-headline-levels 0)))
2230 2230
2231 ;; Write custom stlyes for source blocks 2231 ;; Write custom styles for source blocks
2232 (org-odt-insert-custom-styles-for-srcblocks 2232 (org-odt-insert-custom-styles-for-srcblocks
2233 (mapconcat 2233 (mapconcat
2234 (lambda (style) 2234 (lambda (style)
@@ -2479,7 +2479,7 @@ Do this when translation to MathML fails."
2479;; `org-export-preprocess-after-blockquote-hook'. Note that this hook 2479;; `org-export-preprocess-after-blockquote-hook'. Note that this hook
2480;; is the one that is closest and well before the call to 2480;; is the one that is closest and well before the call to
2481;; `org-export-attach-captions-and-attributes' in 2481;; `org-export-attach-captions-and-attributes' in
2482;; `org-export-preprocess-stirng'. The above arrangement permits 2482;; `org-export-preprocess-string'. The above arrangement permits
2483;; captions, labels and attributes to be attached to png images 2483;; captions, labels and attributes to be attached to png images
2484;; generated out of latex equations. 2484;; generated out of latex equations.
2485(add-hook 'org-export-preprocess-after-blockquote-hook 2485(add-hook 'org-export-preprocess-after-blockquote-hook
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index ccdbc314a53..6ffa86a1204 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -145,8 +145,8 @@
145(defgroup org-protocol nil 145(defgroup org-protocol nil
146 "Intercept calls from emacsclient to trigger custom actions. 146 "Intercept calls from emacsclient to trigger custom actions.
147 147
148This is done by advising `server-visit-files' to scann the list of filenames 148This is done by advising `server-visit-files' to scan the list of filenames
149for `org-protocol-the-protocol' and sub-procols defined in 149for `org-protocol-the-protocol' and sub-protocols defined in
150`org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'." 150`org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'."
151 :version "22.1" 151 :version "22.1"
152 :group 'convenience 152 :group 'convenience
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index dc794dd92c5..67540a67688 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -277,12 +277,12 @@ in the sitemap."
277 :type 'string) 277 :type 'string)
278 278
279(defcustom org-publish-sitemap-file-entry-format "%t" 279(defcustom org-publish-sitemap-file-entry-format "%t"
280 "How a sitemap file entry is formated. 280 "How a sitemap file entry is formatted.
281You could use brackets to delimit on what part the link will be. 281You could use brackets to delimit on what part the link will be.
282 282
283%t is the title. 283%t is the title.
284%a is the author. 284%a is the author.
285%d is the date formated using `org-publish-sitemap-date-format'." 285%d is the date formatted using `org-publish-sitemap-date-format'."
286 :group 'org-publish 286 :group 'org-publish
287 :type 'string) 287 :type 'string)
288 288
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index df93a9a7271..0d2a2e6a973 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -50,7 +50,7 @@
50(defvar orgtbl-after-send-table-hook nil 50(defvar orgtbl-after-send-table-hook nil
51 "Hook for functions attaching to `C-c C-c', if the table is sent. 51 "Hook for functions attaching to `C-c C-c', if the table is sent.
52This can be used to add additional functionality after the table is sent 52This can be used to add additional functionality after the table is sent
53to the receiver position, othewise, if table is not sent, the functions 53to the receiver position, otherwise, if table is not sent, the functions
54are not run.") 54are not run.")
55 55
56(defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized) 56(defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized)
@@ -1299,7 +1299,7 @@ However, when FORCE is non-nil, create new columns if necessary."
1299(defun org-table-line-to-dline (line &optional above) 1299(defun org-table-line-to-dline (line &optional above)
1300 "Turn a buffer line number into a data line number. 1300 "Turn a buffer line number into a data line number.
1301If there is no data line in this line, return nil. 1301If there is no data line in this line, return nil.
1302If there is no matchin dline (most likely te refrence was a hline), the 1302If there is no matching dline (most likely the reference was a hline), the
1303first dline below it is used. When ABOVE is non-nil, the one above is used." 1303first dline below it is used. When ABOVE is non-nil, the one above is used."
1304 (catch 'exit 1304 (catch 'exit
1305 (let ((ll (length org-table-dlines)) 1305 (let ((ll (length org-table-dlines))
@@ -2671,7 +2671,7 @@ in the buffer and column1 and column2 are table column numbers."
2671 (prog1 (org-trim (org-table-get-field c1)) 2671 (prog1 (org-trim (org-table-get-field c1))
2672 (if highlight (org-table-highlight-rectangle (point) (point))))) 2672 (if highlight (org-table-highlight-rectangle (point) (point)))))
2673 ;; A range, return a vector 2673 ;; A range, return a vector
2674 ;; First sort the numbers to get a regular ractangle 2674 ;; First sort the numbers to get a regular rectangle
2675 (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp)) 2675 (if (< r2 r1) (setq tmp r1 r1 r2 r2 tmp))
2676 (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp)) 2676 (if (< c2 c1) (setq tmp c1 c1 c2 c2 tmp))
2677 (if corners-only 2677 (if corners-only
@@ -2931,7 +2931,7 @@ known that the table will be realigned a little later anyway."
2931 2931
2932(defun org-table-iterate (&optional arg) 2932(defun org-table-iterate (&optional arg)
2933 "Recalculate the table until it does not change anymore. 2933 "Recalculate the table until it does not change anymore.
2934The maximun number of iterations is 10, but you can chose a different value 2934The maximum number of iterations is 10, but you can choose a different value
2935with the prefix ARG." 2935with the prefix ARG."
2936 (interactive "P") 2936 (interactive "P")
2937 (let ((imax (if arg (prefix-numeric-value arg) 10)) 2937 (let ((imax (if arg (prefix-numeric-value arg) 10))
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 68f64974ff3..c1a59ee70cb 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -69,7 +69,7 @@
69;; "taskjuggler_project" (or whatever you customized 69;; "taskjuggler_project" (or whatever you customized
70;; `org-export-taskjuggler-project-tag' to). You are now ready to 70;; `org-export-taskjuggler-project-tag' to). You are now ready to
71;; export the project plan with `org-export-as-taskjuggler-and-open' 71;; export the project plan with `org-export-as-taskjuggler-and-open'
72;; which will export the project plan and open a gant chart in 72;; which will export the project plan and open a Gantt chart in
73;; TaskJugglerUI. 73;; TaskJugglerUI.
74;; 74;;
75;; * Resources 75;; * Resources
@@ -572,7 +572,7 @@ with separator \"\n\"."
572 (and filtered-items (mapconcat 'identity filtered-items "\n")))) 572 (and filtered-items (mapconcat 'identity filtered-items "\n"))))
573 573
574(defun org-taskjuggler-get-attributes (item attributes) 574(defun org-taskjuggler-get-attributes (item attributes)
575 "Return all attribute as a single formated string. ITEM is an 575 "Return all attribute as a single formatted string. ITEM is an
576alist representing either a resource or a task. ATTRIBUTES is a 576alist representing either a resource or a task. ATTRIBUTES is a
577list of symbols. Only entries from ITEM are considered that are 577list of symbols. Only entries from ITEM are considered that are
578listed in ATTRIBUTES." 578listed in ATTRIBUTES."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c5d5e545b9f..57d2c96514e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4717,7 +4717,7 @@ but the stars and the body are.")
4717 "\\(?: +" org-todo-regexp "\\)?" 4717 "\\(?: +" org-todo-regexp "\\)?"
4718 "\\(?: +\\(\\[#.\\]\\)\\)?" 4718 "\\(?: +\\(\\[#.\\]\\)\\)?"
4719 "\\(?: +" 4719 "\\(?: +"
4720 ;; Stats cookies can be sticked to body. 4720 ;; Stats cookies can be stuck to body.
4721 "\\(?:\\[[0-9%%/]+\\] *\\)?" 4721 "\\(?:\\[[0-9%%/]+\\] *\\)?"
4722 "\\(%s\\)" 4722 "\\(%s\\)"
4723 "\\(?: *\\[[0-9%%/]+\\]\\)?" 4723 "\\(?: *\\[[0-9%%/]+\\]\\)?"
@@ -5241,7 +5241,7 @@ The time stamps may be either active or inactive.")
5241(defvar org-emph-face nil) 5241(defvar org-emph-face nil)
5242 5242
5243(defun org-do-emphasis-faces (limit) 5243(defun org-do-emphasis-faces (limit)
5244 "Run through the buffer and add overlays to emphasised strings." 5244 "Run through the buffer and add overlays to emphasized strings."
5245 (let (rtn a) 5245 (let (rtn a)
5246 (while (and (not rtn) (re-search-forward org-emph-re limit t)) 5246 (while (and (not rtn) (re-search-forward org-emph-re limit t))
5247 (if (not (= (char-after (match-beginning 3)) 5247 (if (not (= (char-after (match-beginning 3))
@@ -5737,7 +5737,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
5737 5737
5738(defvar org-font-lock-set-keywords-hook nil 5738(defvar org-font-lock-set-keywords-hook nil
5739 "Functions that can manipulate `org-font-lock-extra-keywords'. 5739 "Functions that can manipulate `org-font-lock-extra-keywords'.
5740This is calles after `org-font-lock-extra-keywords' is defined, but before 5740This is called after `org-font-lock-extra-keywords' is defined, but before
5741it is installed to be used by font lock. This can be useful if something 5741it is installed to be used by font lock. This can be useful if something
5742needs to be inserted at a specific position in the font-lock sequence.") 5742needs to be inserted at a specific position in the font-lock sequence.")
5743 5743
@@ -5854,7 +5854,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
5854 (org-set-local 'org-pretty-entities (not org-pretty-entities)) 5854 (org-set-local 'org-pretty-entities (not org-pretty-entities))
5855 (org-restart-font-lock) 5855 (org-restart-font-lock)
5856 (if org-pretty-entities 5856 (if org-pretty-entities
5857 (message "Entities are displayed as UTF8 characers") 5857 (message "Entities are displayed as UTF8 characters")
5858 (save-restriction 5858 (save-restriction
5859 (widen) 5859 (widen)
5860 (org-decompose-region (point-min) (point-max)) 5860 (org-decompose-region (point-min) (point-max))
@@ -11441,7 +11441,7 @@ changes. Such blocking occurs when:
11441 (forward-line 1) 11441 (forward-line 1)
11442 (re-search-forward org-not-done-heading-regexp pos t)) 11442 (re-search-forward org-not-done-heading-regexp pos t))
11443 (throw 'dont-block nil)) ; block, there is an older sibling not done. 11443 (throw 'dont-block nil)) ; block, there is an older sibling not done.
11444 ;; Search further up the hierarchy, to see if an anchestor is blocked 11444 ;; Search further up the hierarchy, to see if an ancestor is blocked
11445 (while t 11445 (while t
11446 (goto-char parent-pos) 11446 (goto-char parent-pos)
11447 (if (not (looking-at org-not-done-heading-regexp)) 11447 (if (not (looking-at org-not-done-heading-regexp))
@@ -15123,7 +15123,7 @@ user."
15123 (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) 15123 (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
15124 t nil ans))) 15124 t nil ans)))
15125 15125
15126 ;; Help matching dottet european dates 15126 ;; Help matching dotted european dates
15127 (when (string-match 15127 (when (string-match
15128 "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) 15128 "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans)
15129 (setq year (if (match-end 3) 15129 (setq year (if (match-end 3)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index d72eef27a58..1e07ac4cf09 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1533,7 +1533,7 @@ the project file."
1533 ;; .ali file for a spec file. If we are, go to step 3. 1533 ;; .ali file for a spec file. If we are, go to step 3.
1534 ;; 3- If the file is not found or step 2 failed: 1534 ;; 3- If the file is not found or step 2 failed:
1535 ;; find the name of the "other file", ie the body, and look 1535 ;; find the name of the "other file", ie the body, and look
1536 ;; for its associated .ali file by subtituting the extension 1536 ;; for its associated .ali file by substituting the extension
1537 ;; 1537 ;;
1538 ;; We must also handle the case of separate packages and subprograms: 1538 ;; We must also handle the case of separate packages and subprograms:
1539 ;; 4- If no ali file was found, we try to modify the file name by removing 1539 ;; 4- If no ali file was found, we try to modify the file name by removing
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index f52864df809..e7d00815708 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1429,7 +1429,7 @@ casts and declarations are fontified. Used on level 2 and higher."
1429 nil) 1429 nil)
1430 1430
1431 ((and (not c-enums-contain-decls) 1431 ((and (not c-enums-contain-decls)
1432 ;; An optimisation quickly to eliminate scans of long enum 1432 ;; An optimization quickly to eliminate scans of long enum
1433 ;; declarations in the next cond arm. 1433 ;; declarations in the next cond arm.
1434 (let ((paren-state (c-parse-state))) 1434 (let ((paren-state (c-parse-state)))
1435 (and 1435 (and