------------------------------------------------------------ revno: 115137 committer: Leo Liu branch nick: trunk timestamp: Mon 2013-11-18 10:27:12 +0800 message: * NEWS: Mention new features for Octave mode. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-11-01 15:47:10 +0000 +++ etc/ChangeLog 2013-11-18 02:27:12 +0000 @@ -1,3 +1,7 @@ +2013-11-18 Leo Liu + + * NEWS: Mention new features for Octave mode. + 2013-11-01 Jan Djärv * NEWS: Mention :distant-foreground. === modified file 'etc/NEWS' --- etc/NEWS 2013-11-11 05:18:53 +0000 +++ etc/NEWS 2013-11-18 02:27:12 +0000 @@ -408,6 +408,14 @@ will revert to the old behavior. +** New features for Octave mode: +*** Font locking for texinfo comments and new keywords +*** Completion in Octave file buffers +*** Eldoc support +*** Jump to definition +*** Documentation lookup/search +*** Code cleanup and various bug fixes + ** Ido *** Ido has a manual now. *** `ido-use-virtual-buffers' takes a new value 'auto. ------------------------------------------------------------ revno: 115136 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15915 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-11-17 21:01:34 -0500 message: * lisp/electric.el (electric-indent-mode-map): Remove. (electric-indent-mode): Change the global-map instead. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-18 01:48:46 +0000 +++ lisp/ChangeLog 2013-11-18 02:01:34 +0000 @@ -1,6 +1,10 @@ 2013-11-18 Stefan Monnier - * textmodes/text-mode.el (paragraph-indent-minor-mode): Use add-function. + * electric.el (electric-indent-mode-map): Remove. + (electric-indent-mode): Change the global-map instead (bug#15915). + + * textmodes/text-mode.el (paragraph-indent-minor-mode): + Use add-function. 2013-11-17 Stefan Monnier === modified file 'lisp/electric.el' --- lisp/electric.el 2013-11-06 03:37:03 +0000 +++ lisp/electric.el 2013-11-18 02:01:34 +0000 @@ -273,12 +273,6 @@ (let ((electric-indent-mode nil)) (newline arg 'interactive))) -(defvar electric-indent-mode-map - (let ((map (make-sparse-keymap))) - (define-key map [?\C-j] 'electric-indent-just-newline) - map) - "Keymap used for `electric-mode-mode'.") - ;;;###autoload (define-minor-mode electric-indent-mode "Toggle on-the-fly reindentation (Electric Indent mode). @@ -291,8 +285,14 @@ insert a character from `electric-indent-chars'." :global t :group 'electricity (if (not electric-indent-mode) - (remove-hook 'post-self-insert-hook - #'electric-indent-post-self-insert-function) + (progn + (when (eq (lookup-key global-map [?\C-j]) + 'electric-indent-just-newline) + (define-key global-map [?\C-j] 'newline-and-indent)) + (remove-hook 'post-self-insert-hook + #'electric-indent-post-self-insert-function)) + (when (eq (lookup-key global-map [?\C-j]) 'newline-and-indent) + (define-key global-map [?\C-j] 'electric-indent-just-newline)) ;; post-self-insert-hooks interact in non-trivial ways. ;; It turns out that electric-indent-mode generally works better if run ;; late, but still before blink-paren. ------------------------------------------------------------ revno: 115135 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-11-17 20:48:46 -0500 message: * lisp/textmodes/text-mode.el (paragraph-indent-minor-mode): Use add-function. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-17 23:11:27 +0000 +++ lisp/ChangeLog 2013-11-18 01:48:46 +0000 @@ -1,3 +1,7 @@ +2013-11-18 Stefan Monnier + + * textmodes/text-mode.el (paragraph-indent-minor-mode): Use add-function. + 2013-11-17 Stefan Monnier * emacs-lisp/nadvice.el (remove-function): Align with === modified file 'lisp/textmodes/text-mode.el' --- lisp/textmodes/text-mode.el 2013-10-10 00:32:36 +0000 +++ lisp/textmodes/text-mode.el 2013-11-18 01:48:46 +0000 @@ -121,9 +121,10 @@ (concat ps-re paragraph-start))))) ;; Change the indentation function. (if paragraph-indent-minor-mode - (set (make-local-variable 'indent-line-function) 'indent-to-left-margin) - (if (eq indent-line-function 'indent-to-left-margin) - (set (make-local-variable 'indent-line-function) 'indent-region)))) + (add-function :override (local 'indent-line-function) + #'indent-to-left-margin) + (remove-function (local 'indent-line-function) + #'indent-to-left-margin))) (defalias 'indented-text-mode 'text-mode) ------------------------------------------------------------ revno: 115134 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-11-17 18:11:27 -0500 message: * lisp/emacs-lisp/nadvice.el (remove-function): Align with add-function's behavior. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-17 23:01:23 +0000 +++ lisp/ChangeLog 2013-11-17 23:11:27 +0000 @@ -1,5 +1,8 @@ 2013-11-17 Stefan Monnier + * emacs-lisp/nadvice.el (remove-function): Align with + add-function's behavior. + * progmodes/gdb-mi.el: Avoid backtracking in regexp matcher. (gdb--string-regexp): New constant. (gdb-tooltip-print, gdb-var-evaluate-expression-handler) === modified file 'lisp/emacs-lisp/nadvice.el' --- lisp/emacs-lisp/nadvice.el 2013-08-04 20:18:11 +0000 +++ lisp/emacs-lisp/nadvice.el 2013-11-17 23:11:27 +0000 @@ -284,7 +284,7 @@ (cond ((eq 'local (car-safe place)) (setq place `(advice--buffer-local ,@(cdr place)))) ((symbolp place) - (error "Use (default-value '%S) or (local '%S)" place place))) + (setq place `(default-value ',place)))) (gv-letplace (getter setter) place (macroexp-let2 nil new `(advice--remove-function ,getter ,function) `(unless (eq ,new ,getter) ,(funcall setter new))))) ------------------------------------------------------------ revno: 115133 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-11-17 18:01:23 -0500 message: * lisp/progmodes/gdb-mi.el: Avoid backtracking in regexp matcher. (gdb--string-regexp): New constant. (gdb-tooltip-print, gdb-var-evaluate-expression-handler) (gdbmi-bnf-stream-record, gdb-jsonify-buffer): Use it. (gdb-source-file-regexp, gdb-prompt-name-regexp): Use it and change submatch 1. (gdb-get-source-file-list, gdb-get-prompt, gdb-get-source-file): Adjust use accordingly. (gdb-breakpoints-list-handler-custom): Pre-build the y/n string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-17 21:39:13 +0000 +++ lisp/ChangeLog 2013-11-17 23:01:23 +0000 @@ -1,3 +1,15 @@ +2013-11-17 Stefan Monnier + + * progmodes/gdb-mi.el: Avoid backtracking in regexp matcher. + (gdb--string-regexp): New constant. + (gdb-tooltip-print, gdb-var-evaluate-expression-handler) + (gdbmi-bnf-stream-record, gdb-jsonify-buffer): Use it. + (gdb-source-file-regexp, gdb-prompt-name-regexp): Use it and change + submatch 1. + (gdb-get-source-file-list, gdb-get-prompt, gdb-get-source-file): + Adjust use accordingly. + (gdb-breakpoints-list-handler-custom): Pre-build the y/n string. + 2013-11-17 Adam Sokolnicki (tiny change) * progmodes/ruby-mode.el (ruby-toggle-block): Don't stop at === modified file 'lisp/progmodes/gdb-mi.el' --- lisp/progmodes/gdb-mi.el 2013-09-13 06:56:35 +0000 +++ lisp/progmodes/gdb-mi.el 2013-11-17 23:01:23 +0000 @@ -1016,11 +1016,15 @@ (declare-function tooltip-show "tooltip" (text &optional use-echo-area)) +(defconst gdb--string-regexp "\"\\(?:[^\\\"]\\|\\\\.\\)*\"") + (defun gdb-tooltip-print (expr) (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) (goto-char (point-min)) (cond - ((re-search-forward ".*value=\\(\".*\"\\)" nil t) + ((re-search-forward (concat ".*value=\\(" gdb--string-regexp + "\\)") + nil t) (tooltip-show (concat expr " = " (read (match-string 1))) (or gud-tooltip-echo-area @@ -1198,7 +1202,8 @@ (defun gdb-var-evaluate-expression-handler (varnum changed) (goto-char (point-min)) - (re-search-forward ".*value=\\(\".*\"\\)" nil t) + (re-search-forward (concat ".*value=\\(" gdb--string-regexp "\\)") + nil t) (let ((var (assoc varnum gdb-var-list))) (when var (if changed (setcar (nthcdr 5 var) 'changed)) @@ -2124,7 +2129,8 @@ '&' c-string" (when (< gdbmi-bnf-offset (length gud-marker-acc)) (if (and (member (aref gud-marker-acc gdbmi-bnf-offset) '(?~ ?@ ?&)) - (string-match "\\([~@&]\\)\\(\".*?\"\\)\n" gud-marker-acc + (string-match (concat "\\([~@&]\\)\\(" gdb--string-regexp "\\)\n") + gud-marker-acc gdbmi-bnf-offset)) (let ((prefix (match-string 1 gud-marker-acc)) (c-string (match-string 2 gud-marker-acc))) @@ -2586,9 +2592,10 @@ (insert "]")))))) (goto-char (point-min)) (insert "{") - (while (re-search-forward - "\\([[:alnum:]-_]+\\)=\\({\\|\\[\\|\"\"\\|\".*?[^\\]\"\\)" nil t) - (replace-match "\"\\1\":\\2" nil nil)) + (let ((re (concat "\\([[:alnum:]-_]+\\)=\\({\\|\\[\\|\"\"\\|" + gdb--string-regexp "\\)"))) + (while (re-search-forward re nil t) + (replace-match "\"\\1\":\\2" nil nil))) (goto-char (point-max)) (insert "}"))) @@ -2812,8 +2819,12 @@ (or (bindat-get-field breakpoint 'disp) "") (let ((flag (bindat-get-field breakpoint 'enabled))) (if (string-equal flag "y") - (propertize "y" 'font-lock-face font-lock-warning-face) - (propertize "n" 'font-lock-face font-lock-comment-face))) + (eval-when-compile + (propertize "y" 'font-lock-face + font-lock-warning-face)) + (eval-when-compile + (propertize "n" 'font-lock-face + font-lock-comment-face)))) (bindat-get-field breakpoint 'addr) (or (bindat-get-field breakpoint 'times) "") (if (and type (string-match ".*watchpoint" type)) @@ -2865,7 +2876,8 @@ (gdb-put-breakpoint-icon (string-equal flag "y") bptno (string-to-number line))))))))) -(defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"") +(defconst gdb-source-file-regexp + (concat "fullname=\\(" gdb--string-regexp "\\)")) (defun gdb-get-location (bptno line flag) "Find the directory containing the relevant source file. @@ -2874,6 +2886,7 @@ (catch 'file-not-found (if (re-search-forward gdb-source-file-regexp nil t) (delete (cons bptno "File not found") gdb-location-alist) + ;; FIXME: Why/how do we use (match-string 1) when the search failed? (push (cons bptno (match-string 1)) gdb-location-alist) (gdb-resync) (unless (assoc bptno gdb-location-alist) @@ -4214,7 +4227,7 @@ is set in them." (goto-char (point-min)) (while (re-search-forward gdb-source-file-regexp nil t) - (push (match-string 1) gdb-source-file-list)) + (push (read (match-string 1)) gdb-source-file-list)) (dolist (buffer (buffer-list)) (with-current-buffer buffer (when (member buffer-file-name gdb-source-file-list) @@ -4253,14 +4266,15 @@ (setq gud-overlay-arrow-position (make-marker)) (set-marker gud-overlay-arrow-position position)))))))) -(defvar gdb-prompt-name-regexp "value=\"\\(.*?\\)\"") +(defconst gdb-prompt-name-regexp + (concat "value=\\(" gdb--string-regexp "\\)")) (defun gdb-get-prompt () "Find prompt for GDB session." (goto-char (point-min)) (setq gdb-prompt-name nil) (re-search-forward gdb-prompt-name-regexp nil t) - (setq gdb-prompt-name (match-string 1)) + (setq gdb-prompt-name (read (match-string 1))) ;; Insert first prompt. (setq gdb-filter-output (concat gdb-filter-output gdb-prompt-name))) @@ -4541,7 +4555,7 @@ buffers, if required." (goto-char (point-min)) (if (re-search-forward gdb-source-file-regexp nil t) - (setq gdb-main-file (match-string 1))) + (setq gdb-main-file (read (match-string 1)))) (if gdb-many-windows (gdb-setup-windows) (gdb-get-buffer-create 'gdb-breakpoints-buffer) ------------------------------------------------------------ revno: 115132 committer: Xue Fuqiao branch nick: trunk timestamp: Mon 2013-11-18 06:30:44 +0800 message: Minor doc fixes. * doc/lispref/os.texi (Time Parsing): (Processor Run Time, Input Modes, Terminal Output): Minor fixes. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-14 08:38:50 +0000 +++ doc/lispref/ChangeLog 2013-11-17 22:30:44 +0000 @@ -1,3 +1,8 @@ +2013-11-17 Xue Fuqiao + + * os.texi (Time Parsing): + (Processor Run Time, Input Modes, Terminal Output): Minor fixes. + 2013-11-14 Glenn Morris * loading.texi (Library Search): Update section. === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2013-11-11 22:52:08 +0000 +++ doc/lispref/os.texi 2013-11-17 22:30:44 +0000 @@ -1524,7 +1524,7 @@ @defun seconds-to-time seconds This function converts @var{seconds}, a floating point number of seconds since the epoch, to a time value and returns that. To perform -the inverse conversion, use @code{float-time}. +the inverse conversion, use @code{float-time} (@pxref{Time of Day}). @end defun @defun format-seconds format-string seconds @@ -1586,6 +1586,7 @@ both elapsed and processor time, used by the Emacs process. @deffn Command emacs-uptime &optional format +@cindex uptime of Emacs This function returns a string representing the Emacs @dfn{uptime}---the elapsed wall-clock time this instance of Emacs is running. The string is formatted by @code{format-seconds} according @@ -1922,10 +1923,10 @@ @defun set-input-mode interrupt flow meta &optional quit-char This function sets the mode for reading keyboard input. If -@var{interrupt} is non-null, then Emacs uses input interrupts. If it is -@code{nil}, then it uses @sc{cbreak} mode. The default setting is -system-dependent. Some systems always use @sc{cbreak} mode regardless -of what is specified. +@var{interrupt} is non-@code{nil}, then Emacs uses input interrupts. +If it is @code{nil}, then it uses @sc{cbreak} mode. The default +setting is system-dependent. Some systems always use @sc{cbreak} mode +regardless of what is specified. When Emacs communicates directly with X, it ignores this argument and uses interrupts if that is the way it knows how to communicate. @@ -2075,17 +2076,17 @@ were actually output, you can determine reliably whether they correspond to the Termcap specifications in use. +@example +@group +(open-termscript "../junk/termscript") + @result{} nil +@end group +@end example + You close the termscript file by calling this function with an argument of @code{nil}. See also @code{open-dribble-file} in @ref{Recording Input}. - -@example -@group -(open-termscript "../junk/termscript") - @result{} nil -@end group -@end example @end deffn @node Sound Output @@ -2096,6 +2097,7 @@ certain systems are supported; if you call @code{play-sound} on a system which cannot really do the job, it gives an error. +@c FIXME: Add indexes for Au and WAV? --xfq The sound must be stored as a file in RIFF-WAVE format (@samp{.wav}) or Sun Audio format (@samp{.au}). ------------------------------------------------------------ revno: 115131 fixes bug: http://debbugs.gnu.org/15914 author: Adam Sokolnicki committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2013-11-17 23:39:13 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-toggle-block): Don't stop at interpolation curlies. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-17 04:22:24 +0000 +++ lisp/ChangeLog 2013-11-17 21:39:13 +0000 @@ -1,3 +1,8 @@ +2013-11-17 Adam Sokolnicki (tiny change) + + * progmodes/ruby-mode.el (ruby-toggle-block): Don't stop at + interpolation curlies (Bug#15914). + 2013-11-17 Jay Belanger * calc/calc.el (calc-context-sensitive-enter): New variable. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-15 18:09:10 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-17 21:39:13 +0000 @@ -1590,8 +1590,9 @@ (let ((start (point)) beg end) (end-of-line) (unless - (if (and (re-search-backward "\\({\\)\\|\\_\\)") (progn + (goto-char (or (match-beginning 1) (match-beginning 2))) (setq beg (point)) (save-match-data (ruby-forward-sexp)) (setq end (point)) === modified file 'test/automated/ruby-mode-tests.el' --- test/automated/ruby-mode-tests.el 2013-11-04 10:50:47 +0000 +++ test/automated/ruby-mode-tests.el 2013-11-17 21:39:13 +0000 @@ -309,6 +309,12 @@ (ruby-toggle-block) (should (string= "foo do |b|\n b + 1\nend" (buffer-string))))) +(ert-deftest ruby-toggle-block-with-interpolation () + (ruby-with-temp-buffer "foo do\n \"#{bar}\"\nend" + (beginning-of-line) + (ruby-toggle-block) + (should (string= "foo { \"#{bar}\" }" (buffer-string))))) + (ert-deftest ruby-recognize-symbols-starting-with-at-character () (ruby-assert-face ":@abc" 3 font-lock-constant-face)) ------------------------------------------------------------ revno: 115130 fixes bug: http://debbugs.gnu.org/15913 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2013-11-17 23:02:09 +0200 message: Fix bug #15913 with disappearing mouse highlight on MS-Windows. src/w32term.c (x_update_window_end): Don't invalidate the entire mouse-highlight info, just signal frame_up_to_date_hook that mouse highlight needs to be redisplayed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-17 03:58:30 +0000 +++ src/ChangeLog 2013-11-17 21:02:09 +0000 @@ -1,3 +1,9 @@ +2013-11-17 Eli Zaretskii + + * w32term.c (x_update_window_end): Don't invalidate the entire + mouse-highlight info, just signal frame_up_to_date_hook that mouse + highlight needs to be redisplayed. (Bug#15913) + 2013-11-17 Paul Eggert * lisp.h (DEBUGGER_SEES_C_MACROS): Remove. === modified file 'src/w32term.c' --- src/w32term.c 2013-10-29 05:55:25 +0000 +++ src/w32term.c 2013-11-17 21:02:09 +0000 @@ -656,7 +656,13 @@ /* If a row with mouse-face was overwritten, arrange for XTframe_up_to_date to redisplay the mouse highlight. */ if (mouse_face_overwritten_p) - reset_mouse_highlight (MOUSE_HL_INFO (XFRAME (w->frame))); + { + Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (XFRAME (w->frame)); + + hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1; + hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1; + hlinfo->mouse_face_window = Qnil; + } /* Unhide the caret. This won't actually show the cursor, unless it was visible before the corresponding call to HideCaret in ------------------------------------------------------------ revno: 115129 committer: Glenn Morris branch nick: trunk timestamp: Sun 2013-11-17 11:34:36 -0800 message: * etc/TODO: Addition. diff: === modified file 'etc/TODO' --- etc/TODO 2013-10-30 06:27:20 +0000 +++ etc/TODO 2013-11-17 19:34:36 +0000 @@ -199,6 +199,14 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-08/msg00456.html * Important features: + +** "Emacs as word processor" +http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00515.html + rms writes: + 25 years ago I hoped we would extend Emacs to do WYSIWG word + processing. That is why we added text properties and variable + width fonts. However, more features are still needed to achieve this. + ** Extended text-properties (to make overlays "obsolete") *** Several text-property planes This would get us rid of font-lock-face property (and I'd be happy to ------------------------------------------------------------ revno: 115128 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-11-16 23:51:24 -0800 message: Spelling fixes. * lisp/org/ob-python.el (org-babel-python-with-earmuffs): Rename from org-babel-python-with-earmufs. All uses changed. (org-babel-python-without-earmuffs): Rename from org-babel-python-without-earmufs. All uses changed. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-11-17 04:22:24 +0000 +++ doc/misc/ChangeLog 2013-11-17 07:51:24 +0000 @@ -1773,7 +1773,7 @@ * org.texi (Clocking commands): Document the use of S-M- on clock timestamps. - * org.texi (Fast access to TODO states): Explicitely says only + * org.texi (Fast access to TODO states): Explicitly says only letters are supported as fast TODO selection keys. * org.texi (Link abbreviations): Illustrate the use of the "%h" @@ -2549,7 +2549,7 @@ 2012-01-03 Bastien Guerry (tiny change) - * org.texi (Selective export): Explicitely mention the default + * org.texi (Selective export): Explicitly mention the default values for `org-export-select-tags', `org-export-exclude-tags'. === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2013-11-12 14:54:41 +0000 +++ doc/misc/org.texi 2013-11-17 07:51:24 +0000 @@ -688,7 +688,7 @@ * System-wide header arguments:: Set global default values * Language-specific header arguments:: Set default values by language * Header arguments in Org mode properties:: Set default values for a buffer or heading -* Language-specific header arguments in Org mode properties:: Set langugage-specific default values for a buffer or heading +* Language-specific header arguments in Org mode properties:: Set language-specific default values for a buffer or heading * Code block specific header arguments:: The most common way to set values * Header arguments in function calls:: The most specific level @@ -3874,7 +3874,7 @@ Search for a link target @samp{<>}, or do a text search for @samp{my target}, similar to the search in internal links, see @ref{Internal links}. In HTML export (@pxref{HTML export}), such a file -link will become a HTML reference to the corresponding named anchor in +link will become an HTML reference to the corresponding named anchor in the linked file. @item *My Target In an Org file, restrict search to headlines. @@ -8055,7 +8055,7 @@ time as matching tags. The properties may be real properties, or special properties that represent other metadata (@pxref{Special properties}). For example, the ``property'' @code{TODO} represents the TODO keyword of the -entry and the ``propety'' @code{PRIORITY} represents the PRIORITY keyword of +entry and the ``property'' @code{PRIORITY} represents the PRIORITY keyword of the entry. The ITEM special property cannot currently be used in tags/property searches@footnote{But @pxref{x-agenda-skip-entry-regexp, ,skipping entries based on regexp}.}. @@ -8547,7 +8547,7 @@ @end table When set to a positive integer, each option will exclude entries from other -catogories: for example, @code{(setq org-agenda-max-effort 100)} will limit +categories: for example, @code{(setq org-agenda-max-effort 100)} will limit the agenda to 100 minutes of effort and exclude any entry that as no effort property. If you want to include entries with no effort property, use a negative value for @code{org-agenda-max-effort}. @@ -9632,7 +9632,7 @@ @end example If you would like to move the table of contents to a different location, you -should turn off the detault table using @code{org-export-with-toc} or +should turn off the default table using @code{org-export-with-toc} or @code{#+OPTIONS} and insert @code{#+TOC: headlines N} at the desired location(s). @@ -10856,7 +10856,7 @@ @cindex #+BEAMER_INNER_THEME @cindex #+BEAMER_OUTER_THEME Beamer export introduces a number of keywords to insert code in the -document's header. Four control appearance of the presentantion: +document's header. Four control appearance of the presentation: @code{#+BEAMER_THEME}, @code{#+BEAMER_COLOR_THEME}, @code{#+BEAMER_FONT_THEME}, @code{#+BEAMER_INNER_THEME} and @code{#+BEAMER_OUTER_THEME}. All of them accept optional arguments @@ -10975,7 +10975,7 @@ @section HTML export @cindex HTML export -Org mode contains a HTML (XHTML 1.0 strict) exporter with extensive +Org mode contains an HTML (XHTML 1.0 strict) exporter with extensive HTML formatting, in ways similar to John Gruber's @emph{markdown} language, but with additional support for tables. @@ -10998,11 +10998,11 @@ @table @kbd @orgcmd{C-c C-e h h,org-html-export-to-html} -Export as a HTML file. For an Org file @file{myfile.org}, +Export as an HTML file. For an Org file @file{myfile.org}, the HTML file will be @file{myfile.html}. The file will be overwritten without warning. @kbd{C-c C-e h o} -Export as a HTML file and immediately open it with a browser. +Export as an HTML file and immediately open it with a browser. @orgcmd{C-c C-e h H,org-html-export-as-html} Export to a temporary buffer. Do not create a file. @end table @@ -11029,7 +11029,7 @@ Org can export to various (X)HTML flavors. Setting the variable @code{org-html-doctype} allows you to export to different -(X)HTML variants. The exported HTML will be adjusted according to the sytax +(X)HTML variants. The exported HTML will be adjusted according to the syntax requirements of that variant. You can either set this variable to a doctype string directly, in which case the exporter will try to adjust the syntax automatically, or you can use a ready-made doctype. The ready-made options @@ -11176,7 +11176,7 @@ targets}). Links to external files will still work if the target file is on the same @i{relative} path as the published Org file. Links to other @file{.org} files will be translated into HTML links under the assumption -that a HTML version also exists of the linked file, at the same relative +that an HTML version also exists of the linked file, at the same relative path. @samp{id:} links can then be used to jump to specific entries across files. For information related to linking files while publishing them to a publishing directory see @ref{Publishing links}. @@ -11773,10 +11773,10 @@ @code{t}: if you want to make the source block a float. It is the default value when a caption is provided. @item -@code{mulicolumn}: if you wish to include a source block which spans multiple -colums in a page. +@code{multicolumn}: if you wish to include a source block which spans multiple +columns in a page. @item -@code{nil}: if you need to avoid any floating evironment, even when a caption +@code{nil}: if you need to avoid any floating environment, even when a caption is provided. It is useful for source code that may not fit in a single page. @end itemize @@ -11838,7 +11838,7 @@ @section Markdown export @cindex Markdown export -@code{md} export back-end generates Markdown syntax@footnote{Vanilla flavour, +@code{md} export back-end generates Markdown syntax@footnote{Vanilla flavor, as defined at @url{http://daringfireball.net/projects/markdown/}.} for an Org mode buffer. @@ -12861,7 +12861,7 @@ @cindex export back-ends, built-in @vindex org-export-backends -On top of the aforemetioned back-ends, Org comes with other built-in ones: +On top of the aforementioned back-ends, Org comes with other built-in ones: @itemize @item @file{ox-man.el}: export to a man page. @@ -12894,8 +12894,8 @@ Convert the selected region into @code{MarkDown}. @end table -This is particularily useful for converting tables and lists in foreign -buffers. E.g., in a HTML buffer, you can turn on @code{orgstruct-mode}, then +This is particularly useful for converting tables and lists in foreign +buffers. E.g., in an HTML buffer, you can turn on @code{orgstruct-mode}, then use Org commands for editing a list, and finally select and convert the list with @code{M-x org-html-convert-region-to-html RET}. @@ -17273,8 +17273,8 @@ @enumerate @item -Reduce the number of Org agenda files: this will reduce the slowliness caused -by accessing to a hard drive. +Reduce the number of Org agenda files: this will reduce the slowness caused +by accessing a hard drive. @item Reduce the number of DONE and archived headlines: this way the agenda does not need to skip them. @@ -17912,7 +17912,7 @@ asked for a way to narrow wide table columns. @item @i{Jason Dunsmore} has been maintaining the Org-Mode server at Rackspace for -several years now. He also sponsered the hosting costs until Rackspace +several years now. He also sponsored the hosting costs until Rackspace started to host us for free. @item @i{Thomas S. Dye} contributed documentation on Worg and helped integrating === modified file 'etc/ORG-NEWS' --- etc/ORG-NEWS 2013-11-12 13:06:26 +0000 +++ etc/ORG-NEWS 2013-11-17 07:51:24 +0000 @@ -101,7 +101,7 @@ Add support for ell, imath, jmath, varphi, varpi, aleph, gimel, beth, dalet, cdots, S (§), dag, ddag, colon, therefore, because, triangleq, leq, geq, lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, -preccurleyeq, succ, succeq, succurleyeq, setminus, nexist(s), mho, +preccurlyeq, succ, succeq, succurlyeq, setminus, nexist(s), mho, check, frown, diamond. Changes loz, vert, checkmark, smile and tilde. *** Anonymous export back-ends @@ -146,7 +146,7 @@ This enables SVG generation from latex code blocks. -*** New option: [[doc:org-habit-show-done-alwyays-green][org-habit-show-done-alwyays-green]] +*** New option: [[doc:org-habit-show-done-always-green][org-habit-show-done-always-green]] See [[http://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha. @@ -277,8 +277,8 @@ moved some contributions into the =contrib/= directory. The rationale for deciding that these files should live in =contrib/= - is either because they rely on third-part softwares that are not - included in Emacs, or because they are not targetting a significant + is either because they rely on third-party software that is not + included in Emacs, or because they are not targeting a significant user-base. - org-colview-xemacs.el @@ -395,7 +395,7 @@ - [[doc:org-export-allow-bind-keywords][org-export-allow-bind-keywords]] :: This option replaces the old option =org-export-allow-BIND= and the default value is =nil=, not =confirm=. - You will need to explicitely set this to =t= in your initialization + You will need to explicitly set this to =t= in your initialization file if you want to allow =#+BIND= keywords. - [[doc:org-export-with-planning][org-export-with-planning]] :: This new option controls the export of @@ -654,7 +654,7 @@ This is useful when you want to quickly share an agenda containing the full list of notes. -**** New commands to drag an agenda line forward (=M-=) or backard (=M-=) +**** New commands to drag an agenda line forward (=M-=) or backward (=M-=) It sometimes handy to move agenda lines around, just to quickly reorganize your tasks, or maybe before saving the agenda to a file. Now you can use @@ -717,7 +717,7 @@ When [[doc:org-agenda-skip-scheduled-if-deadline-is-shown][org-agenda-skip-scheduled-if-deadline-is-shown]] is set to =repeated-after-deadline=, the agenda will skip scheduled items if they are -repeated beyond the current dealine. +repeated beyond the current deadline. **** New option for [[doc:org-agenda-skip-deadline-prewarning-if-scheduled][org-agenda-skip-deadline-prewarning-if-scheduled]] @@ -757,7 +757,7 @@ Using =#+TAGS: { Tag1 : Tag2 Tag3 }= will define =Tag1= as a /group tag/ (note the colon after =Tag1=). If you search for =Tag1=, it will return -headlines containing either =Tag1=, =Tag2= or =Tag3= (or any combinaison +headlines containing either =Tag1=, =Tag2= or =Tag3= (or any combination of those tags.) You can use group tags for sparse tree in an Org buffer, for creating === modified file 'lisp/cedet/ede/proj-elisp.el' --- lisp/cedet/ede/proj-elisp.el 2013-03-21 22:11:03 +0000 +++ lisp/cedet/ede/proj-elisp.el 2013-11-17 07:51:24 +0000 @@ -255,7 +255,7 @@ (save-excursion (if (file-symlink-p ec) (progn - ;; Desymlinkify + ;; Change symlinks to copies. (rename-file ec (concat ec ".tmp")) (copy-file (concat ec ".tmp") ec) (delete-file (concat ec ".tmp")))) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2013-11-12 20:14:21 +0000 +++ lisp/org/ChangeLog 2013-11-17 07:51:24 +0000 @@ -1,3 +1,11 @@ +2013-11-17 Paul Eggert + + Spelling fixes. + * ob-python.el (org-babel-python-with-earmuffs): + Rename from org-babel-python-with-earmufs. All uses changed. + (org-babel-python-without-earmuffs): + Rename from org-babel-python-without-earmufs. All uses changed. + 2013-11-12 Bastien Guerry * org-agenda.el (org-agenda-set-restriction-lock): Autoload. @@ -1887,7 +1895,7 @@ when `org-prefix-has-breadcrumbs' is non-nil. * org.el (org-mode): Don't make characters from - `org-emphasis-alist' word constituants. + `org-emphasis-alist' word constituents. (org-mode-transpose-word-syntax-table): Rename from `org-syntax-table'. (org-transpose-words): Use @@ -3394,7 +3402,7 @@ (org-export--get-buffer-attributes): Store a default title. (org-export-as): Apply function removal. (org-export--get-global-options): Do not set a property with an - explicitely nil value. + explicitly nil value. * ox-publish.el (org-publish-sitemap-sort-files) (org-publish-sitemap-sort-folders) @@ -4526,7 +4534,7 @@ the string returned will end with a single one. * ox-latex.el (org-latex-headline): When a function returns a - sectionning command, only one placeholder should be required. + sectioning command, only one placeholder should be required. * org-element.el (org-element-nested-p): Do not inline function. @@ -5262,8 +5270,8 @@ * org-entities.el (org-entities): Add support for ell, imath, jmath, varphi, varpi, aleph, gimel, beth, dalet, cdots, S (§), dag, ddag, colon, therefore, because, triangleq, leq, geq, - lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, preccurleyeq, - succ, succeq, succurleyeq, setminus, nexist(s), mho, check, frown, + lessgtr, lesseqgtr, ll, lll, gg, ggg, prec, preceq, preccurlyeq, + succ, succeq, succurlyeq, setminus, nexist(s), mho, check, frown, diamond. Changes loz, vert, checkmark, smile and tilde. * ob-C.el: Added C++ to `org-babel-load-languages' automatically @@ -6358,7 +6366,7 @@ * org.el (org-reload): Simplify file-re (orgtbl-*.el files do not exist anymore). Keep org-*.el at the end of the files list. - Explicitely load org-version.el (since it doesn't provide feature + Explicitly load org-version.el (since it doesn't provide feature 'org-version) at the very end, but ignore errors when it doesn't exist. Add parameters 'full and 'message to the call of (org-version) so that after reload the full version information is @@ -8147,7 +8155,7 @@ * org.el (org-read-date): Set cursor-type to nil in the calendar. * org-faces.el (org-date-selected): Use inverse video. - Don't explicitely set bold to nil as it causes `customize-face' to show + Don't explicitly set bold to nil as it causes `customize-face' to show the weight property and thus encourage the user to change it. Warn in the docstring that using bold might cause problems when displaying the calendar. @@ -9228,7 +9236,7 @@ * org-agenda.el (org-agenda-skip-timestamp-if-deadline-is-shown): Skip timestamp items in agenda view if item is already shown as a deadline item. - (org-agenda-skip-dealine-if-done): Pass deadline results to + (org-agenda-skip-deadline-if-done): Pass deadline results to org-agenda-get-timestamps. (org-agenda-get-timestamps): Optionally take list of deadline results, so that timestamp results can be skipped if already @@ -12430,7 +12438,7 @@ 2012-01-03 Nicolas Goaziou * org-footnote.el (org-footnote-create-definition): - Explicitely move point after tag, if it has just been + Explicitly move point after tag, if it has just been inserted. 2012-01-03 Eric Schulte === modified file 'lisp/org/ob-core.el' --- lisp/org/ob-core.el 2013-11-12 19:11:22 +0000 +++ lisp/org/ob-core.el 2013-11-17 07:51:24 +0000 @@ -318,7 +318,7 @@ (message (format "Evaluation of this%scode-block%sis disabled." code-block block-name)))))) - ;; dynamically scoped for asynchroneous export + ;; dynamically scoped for asynchronous export (defvar org-babel-confirm-evaluate-answer-no) (defsubst org-babel-confirm-evaluate (info) === modified file 'lisp/org/ob-python.el' --- lisp/org/ob-python.el 2013-11-12 19:11:22 +0000 +++ lisp/org/ob-python.el 2013-11-17 07:51:24 +0000 @@ -156,14 +156,14 @@ "Return the buffer associated with SESSION." (cdr (assoc session org-babel-python-buffers))) -(defun org-babel-python-with-earmufs (session) +(defun org-babel-python-with-earmuffs (session) (let ((name (if (stringp session) session (format "%s" session)))) (if (and (string= "*" (substring name 0 1)) (string= "*" (substring name (- (length name) 1)))) name (format "*%s*" name)))) -(defun org-babel-python-without-earmufs (session) +(defun org-babel-python-without-earmuffs (session) (let ((name (if (stringp session) session (format "%s" session)))) (if (and (string= "*" (substring name 0 1)) (string= "*" (substring name (- (length name) 1)))) @@ -190,9 +190,9 @@ (if (not (version< "24.1" emacs-version)) (run-python cmd) (unless python-buffer - (setq python-buffer (org-babel-python-with-earmufs session))) + (setq python-buffer (org-babel-python-with-earmuffs session))) (let ((python-shell-buffer-name - (org-babel-python-without-earmufs python-buffer))) + (org-babel-python-without-earmuffs python-buffer))) (run-python cmd)))) ((and (eq 'python-mode org-babel-python-mode) (fboundp 'py-shell)) ; python-mode.el @@ -208,7 +208,7 @@ (concat "Python-" (symbol-name session)))) (py-which-bufname bufname)) (py-shell) - (setq python-buffer (org-babel-python-with-earmufs bufname)))) + (setq python-buffer (org-babel-python-with-earmuffs bufname)))) (t (error "No function available for running an inferior Python"))) (setq org-babel-python-buffers === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2013-11-12 20:14:21 +0000 +++ lisp/org/org-agenda.el 2013-11-17 07:51:24 +0000 @@ -863,7 +863,7 @@ but not scheduled today. When set to the symbol `repeated-after-deadline', skip scheduled -items if they are repeated beyond the current dealine." +items if they are repeated beyond the current deadline." :group 'org-agenda-skip :group 'org-agenda-daily/weekly :type '(choice === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2013-11-12 19:11:22 +0000 +++ lisp/org/org-bibtex.el 2013-11-17 07:51:24 +0000 @@ -44,7 +44,7 @@ ;; Here is an example of a capture template that use some of this ;; information (:author :year :title :journal :pages): ;; -;; (setq org-capure-templates +;; (setq org-capture-templates ;; '((?b "* READ %?\n\n%a\n\n%:author (%:year): %:title\n \ ;; In %:journal, %:pages."))) ;; === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2013-11-12 19:11:22 +0000 +++ lisp/org/org-clock.el 2013-11-17 07:51:24 +0000 @@ -667,7 +667,7 @@ VALUE can be a number of minutes, or a string with format hh:mm or mm. When the string starts with a + or a - sign, the current value of the effort property will be changed by that amount. If the effort value is expressed -as an `org-effort-durations' (e.g. \"3h\"), the modificied value will be +as an `org-effort-durations' (e.g. \"3h\"), the modified value will be converted to a hh:mm duration. This command will update the \"Effort\" property of the currently === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2013-11-12 19:11:22 +0000 +++ lisp/org/org-src.el 2013-11-17 07:51:24 +0000 @@ -69,7 +69,7 @@ This will save the content of the source code editing buffer into a newly created file, not the base buffer for this source block. -If you want to regularily save the base buffer instead of the source +If you want to regularly save the base buffer instead of the source code editing buffer, see `org-edit-src-auto-save-idle-delay' instead." :group 'org-edit-structure :version "24.4" === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2013-11-12 13:06:26 +0000 +++ lisp/org/org-table.el 2013-11-17 07:51:24 +0000 @@ -97,11 +97,11 @@ Each template must define lines that will be treated as a comment and that must contain the \"BEGIN RECEIVE ORGTBL %n\" and \"END RECEIVE ORGTBL\" lines where \"%n\" will be replaced with the name of the table during -insertion of the tempate. The transformed table will later be inserted +insertion of the template. The transformed table will later be inserted between these lines. The template should also contain a minimal table in a multiline comment. -If multiline comments are not possible in the buffer language, +If multiline comments are not possible in the buffer language, you can pack it into a string that will not be used when the code is compiled or executed. Above the table will you need a line with the fixed string \"#+ORGTBL: SEND\", followed by instruction on how to === modified file 'lisp/org/org.el' --- lisp/org/org.el 2013-11-12 19:11:22 +0000 +++ lisp/org/org.el 2013-11-17 07:51:24 +0000 @@ -713,7 +713,7 @@ "Non-nil means preview LaTeX fragments when loading a new Org file. This can also be configured on a per-file basis by adding one of -the followinglines anywhere in the buffer: +the following lines anywhere in the buffer: #+STARTUP: latexpreview #+STARTUP: nolatexpreview" :group 'org-startup @@ -1037,7 +1037,7 @@ :last-refile "org-refile-last-stored" :last-capture-marker "org-capture-last-stored-marker") "Names for bookmarks automatically set by some Org commands. -This can provide strings as names for a number of bookmakrs Org sets +This can provide strings as names for a number of bookmarks Org sets automatically. The following keys are currently implemented: :last-capture :last-capture-marker @@ -19542,7 +19542,7 @@ "Transpose words for Org. This uses the `org-mode-transpose-word-syntax-table' syntax table, which interprets characters in `org-emphasis-alist' as -word constituants." +word constituents." (interactive) (with-syntax-table org-mode-transpose-word-syntax-table (call-interactively 'transpose-words))) @@ -20401,7 +20401,7 @@ (open-line n)) ((org-at-table-p) (org-table-insert-row)) - (t + (t (open-line n)))) (defun org-return (&optional indent) @@ -21148,7 +21148,7 @@ (message "The following feature%s found in load-path, please check if that's correct:\n%s" (if (> (length load-uncore) 1) "s were" " was") load-uncore)) (if load-misses - (message "Some error occured while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" + (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) (message "Successfully reloaded Org\n%s" (org-version nil 'full))))) === modified file 'lisp/org/ox-ascii.el' --- lisp/org/ox-ascii.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox-ascii.el 2013-11-17 07:51:24 +0000 @@ -489,7 +489,7 @@ (defun org-ascii--box-string (s info) "Return string S with a partial box to its left. -INFO is a plist used as a communicaton channel." +INFO is a plist used as a communication channel." (let ((utf8p (eq (plist-get info :ascii-charset) 'utf-8))) (format (if utf8p "╭────\n%s\n╰────" ",----\n%s\n`----") (replace-regexp-in-string @@ -710,7 +710,7 @@ (let ((text-width (if keyword (org-ascii--current-text-width keyword info) (- org-ascii-text-width org-ascii-global-margin))) - ;; Use a counter instead of retreiving ordinal of each + ;; Use a counter instead of retrieving ordinal of each ;; src-block. (count 0)) (mapconcat @@ -748,7 +748,7 @@ (let ((text-width (if keyword (org-ascii--current-text-width keyword info) (- org-ascii-text-width org-ascii-global-margin))) - ;; Use a counter instead of retreiving ordinal of each + ;; Use a counter instead of retrieving ordinal of each ;; src-block. (count 0)) (mapconcat === modified file 'lisp/org/ox-html.el' --- lisp/org/ox-html.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox-html.el 2013-11-17 07:51:24 +0000 @@ -153,7 +153,7 @@ \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">") ("xhtml-transitional" . "") - ("xhtml-framset" . "") ("xhtml-11" . "") @@ -3069,7 +3069,7 @@ contextual information." (format "%s" contents)) -;;;; Tabel Cell +;;;; Table Cell (defun org-html-table-cell (table-cell contents info) "Transcode a TABLE-CELL element from Org to HTML. === modified file 'lisp/org/ox-latex.el' --- lisp/org/ox-latex.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox-latex.el 2013-11-17 07:51:24 +0000 @@ -1325,13 +1325,13 @@ (let* ((class (plist-get info :latex-class)) (level (org-export-get-relative-level headline info)) (numberedp (org-export-numbered-headline-p headline info)) - (class-sectionning (assoc class org-latex-classes)) + (class-sectioning (assoc class org-latex-classes)) ;; Section formatting will set two placeholders: one for ;; the title and the other for the contents. (section-fmt - (let ((sec (if (functionp (nth 2 class-sectionning)) - (funcall (nth 2 class-sectionning) level numberedp) - (nth (1+ level) class-sectionning)))) + (let ((sec (if (functionp (nth 2 class-sectioning)) + (funcall (nth 2 class-sectioning) level numberedp) + (nth (1+ level) class-sectioning)))) (cond ;; No section available for that LEVEL. ((not sec) nil) @@ -1622,7 +1622,7 @@ (value (org-remove-indentation (org-element-property :value latex-environment)))) (if (not (org-string-nw-p label)) value - ;; Environment is labelled: label must be within the environment + ;; Environment is labeled: label must be within the environment ;; (otherwise, a reference pointing to that element will count ;; the section instead). (with-temp-buffer === modified file 'lisp/org/ox-md.el' --- lisp/org/ox-md.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox-md.el 2013-11-17 07:51:24 +0000 @@ -22,7 +22,7 @@ ;;; Commentary: -;; This library implements a Markdown back-end (vanilla flavour) for +;; This library implements a Markdown back-end (vanilla flavor) for ;; Org exporter, based on `html' back-end. See Org manual for more ;; information. === modified file 'lisp/org/ox-odt.el' --- lisp/org/ox-odt.el 2013-11-12 19:11:22 +0000 +++ lisp/org/ox-odt.el 2013-11-17 07:51:24 +0000 @@ -596,7 +596,7 @@ Note that this variable inherently captures how LibreOffice based converters work. LibreOffice maps documents of various formats to classes like Text, Web, Spreadsheet, Presentation etc and -allow document of a given class (irrespective of it's source +allow document of a given class (irrespective of its source format) to be converted to any of the export formats associated with that class. @@ -919,7 +919,7 @@ formatted as canonical Org timestamps. For finer control, avoid these %-specifiers. -Textutal specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\" +Textual specifiers like \"%b\", \"%h\", \"%B\", \"%a\", \"%A\" etc., are displayed by the application in the default language and country specified in `org-odt-styles-file'. Note that the default styles file uses language \"en\" and country \"GB\". You @@ -1436,7 +1436,7 @@ ;; Update content.xml. (let* ( ;; `org-display-custom-times' should be accessed right - ;; within the context of the Org buffer. So obtain it's + ;; within the context of the Org buffer. So obtain its ;; value before moving on to temp-buffer context down below. (custom-time-fmts (if org-display-custom-times @@ -1721,7 +1721,7 @@ (and (eq (org-element-type prev) 'footnote-reference) (format "%s" "OrgSuperscript" ","))) - ;; Trancode footnote reference. + ;; Transcode footnote reference. (let ((n (org-export-get-footnote-number footnote-reference info))) (cond ((not (org-export-footnote-first-reference-p footnote-reference info)) @@ -2195,7 +2195,7 @@ (concat ;; Sneak in a bookmark. The bookmark is used when the ;; labeled element is referenced with a link that - ;; provides it's own description. + ;; provides its own description. (format "\n" label) ;; Label definition: Typically formatted as below: ;; CATEGORY SEQ-NO: LONG CAPTION @@ -2342,7 +2342,6 @@ (user-frame-params (list user-frame-style user-frame-attrs user-frame-anchor)) ;; (embed-as (or embed-as user-frame-anchor "paragraph")) - ;; extrac ;; ;; Handle `:width', `:height' and `:scale' properties. Read ;; them as numbers since we need them for computations. @@ -2372,7 +2371,7 @@ (title (and replaces (capitalize (symbol-name (org-element-type replaces))))) - ;; If yes, note down it's contents. It will go in to frame + ;; If yes, note down its contents. It will go in to frame ;; description. This quite useful for debugging. (desc (and replaces (org-element-property :value replaces)))) (org-odt--render-image/formula entity href width height @@ -2410,7 +2409,7 @@ (title (and replaces (capitalize (symbol-name (org-element-type replaces))))) - ;; If yes, note down it's contents. It will go in to frame + ;; If yes, note down its contents. It will go in to frame ;; description. This quite useful for debugging. (desc (and replaces (org-element-property :value replaces))) width height) @@ -2614,12 +2613,12 @@ INFO is a plist holding contextual information. Return non-nil, if ELEMENT is of type paragraph satisfying -PARAGRAPH-PREDICATE and it's sole content, save for whitespaces, +PARAGRAPH-PREDICATE and its sole content, save for whitespaces, is a link that satisfies LINK-PREDICATE. Return non-nil, if ELEMENT is of type link satisfying -LINK-PREDICATE and it's containing paragraph satisfies -PARAGRAPH-PREDICATE inaddtion to having no other content save for +LINK-PREDICATE and its containing paragraph satisfies +PARAGRAPH-PREDICATE in addition to having no other content save for leading and trailing whitespaces. Return nil, otherwise." @@ -2708,7 +2707,7 @@ (concat (number-to-string n) "."))) item-numbers ""))))) ;; Case 2: Locate a regular and numbered headline in the - ;; hierarchy. Display it's section number. + ;; hierarchy. Display its section number. (let ((headline (loop for el in (cons destination genealogy) when (and (eq (org-element-type el) 'headline) (not (org-export-low-level-p el info)) @@ -2721,7 +2720,7 @@ (mapconcat 'number-to-string (org-export-get-headline-number headline info) ".")))) ;; Case 4: Locate a regular headline in the hierarchy. Display - ;; it's title. + ;; its title. (let ((headline (loop for el in (cons destination genealogy) when (and (eq (org-element-type el) 'headline) (not (org-export-low-level-p el info))) @@ -3101,9 +3100,9 @@ (defun org-odt-hfy-face-to-css (fn) "Create custom style for face FN. -When FN is the default face, use it's foreground and background +When FN is the default face, use its foreground and background properties to create \"OrgSrcBlock\" paragraph style. Otherwise -use it's color attribute to create a character style whose name +use its color attribute to create a character style whose name is obtained from FN. Currently all attributes of FN other than color are ignored. === modified file 'lisp/org/ox-texinfo.el' --- lisp/org/ox-texinfo.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox-texinfo.el 2013-11-17 07:51:24 +0000 @@ -963,7 +963,7 @@ (let* ((class (plist-get info :texinfo-class)) (level (org-export-get-relative-level headline info)) (numberedp (org-export-numbered-headline-p headline info)) - (class-sectionning (assoc class org-texinfo-classes)) + (class-sectioning (assoc class org-texinfo-classes)) ;; Find the index type, if any (index (org-element-property :INDEX headline)) ;; Check if it is an appendix @@ -999,10 +999,10 @@ ;; Section formatting will set two placeholders: one for the ;; title and the other for the contents. (section-fmt - (let ((sec (if (and (symbolp (nth 2 class-sectionning)) - (fboundp (nth 2 class-sectionning))) - (funcall (nth 2 class-sectionning) level numberedp) - (nth (1+ level) class-sectionning)))) + (let ((sec (if (and (symbolp (nth 2 class-sectioning)) + (fboundp (nth 2 class-sectioning))) + (funcall (nth 2 class-sectioning) level numberedp) + (nth (1+ level) class-sectioning)))) (cond ;; No section available for that LEVEL. ((not sec) nil) === modified file 'lisp/org/ox.el' --- lisp/org/ox.el 2013-11-12 17:03:46 +0000 +++ lisp/org/ox.el 2013-11-17 07:51:24 +0000 @@ -2862,7 +2862,7 @@ narrowing of the original buffer. If a region was active in BUFFER, contents will be narrowed to that region instead. -The resulting function can be evaled at a later time, from +The resulting function can be evaluated at a later time, from another buffer, effectively cloning the original buffer there. The function assumes BUFFER's major mode is `org-mode'." @@ -4674,7 +4674,7 @@ "Return TABLE-ROW number. INFO is a plist used as a communication channel. Return value is zero-based and ignores separators. The function returns nil for -special colums and separators." +special columns and separators." (when (and (eq (org-element-property :type table-row) 'standard) (not (org-export-table-row-is-special-p table-row info))) (let ((number 0)) @@ -5866,7 +5866,7 @@ "Export dispatcher for Org mode. It provides an access to common export related tasks in a buffer. -Its interface comes in two flavours: standard and expert. +Its interface comes in two flavors: standard and expert. While both share the same set of bindings, only the former displays the valid keys associations in a dedicated buffer. @@ -5874,7 +5874,7 @@ SPC and DEL (resp. C-n and C-p) keys. Set variable `org-export-dispatch-use-expert-ui' to switch to one -flavour or the other. +flavor or the other. When ARG is \\[universal-argument], repeat the last export action, with the same set of options used back then, on the current buffer. === modified file 'src/buffer.h' --- src/buffer.h 2013-11-08 10:21:35 +0000 +++ src/buffer.h 2013-11-17 07:51:24 +0000 @@ -871,7 +871,7 @@ }; /* Most code should use these functions to set Lisp fields in struct - buffer. (Some setters that are priviate to a single .c file are + buffer. (Some setters that are private to a single .c file are defined as static in those files.) */ INLINE void bset_bidi_paragraph_direction (struct buffer *b, Lisp_Object val)