------------------------------------------------------------ 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) ------------------------------------------------------------ revno: 115127 committer: Jay Belanger branch nick: trunk timestamp: Sat 2013-11-16 22:22:24 -0600 message: * calc/calc.el (calc-context-sensitive-enter): New variable. (calc-enter): Use `calc-context-sensitive-enter'. * doc/misc/calc.texi (Customizing Calc): Mention the new variable `calc-context-sensitive-enter'. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-11-12 13:06:26 +0000 +++ doc/misc/ChangeLog 2013-11-17 04:22:24 +0000 @@ -1,3 +1,8 @@ +2013-11-17 Jay Belanger + + * calc.texi (Customizing Calc): Mention new variable + `calc-context-sensitive-enter'. + 2013-11-12 Aaron Ecay * org.texi (Exporting code blocks): Document the 'inline-only === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2013-10-17 03:37:05 +0000 +++ doc/misc/calc.texi 2013-11-17 04:22:24 +0000 @@ -35696,6 +35696,14 @@ is @code{nil}. @end defvar +@defvar calc-context-sensitive-enter +The command @code{calc-enter} will typically duplicate the top of the +stack. If @code{calc-context-sensitive-enter} is non-@code{nil}, +then the @code{calc-enter} will copy the element at the cursor to the +top of the stack. The default value of +@code{calc-context-sensitive-enter} is @code{nil}. +@end defvar + @defvar calc-undo-length The variable @code{calc-undo-length} determines the number of undo steps that Calc will keep track of when @code{calc-quit} is called. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-16 22:36:14 +0000 +++ lisp/ChangeLog 2013-11-17 04:22:24 +0000 @@ -1,3 +1,8 @@ +2013-11-17 Jay Belanger + + * calc/calc.el (calc-context-sensitive-enter): New variable. + (calc-enter): Use `calc-context-sensitive-enter'. + 2013-11-16 Teodor Zlatanov * progmodes/cfengine.el: Version bump. === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2013-09-11 03:31:56 +0000 +++ lisp/calc/calc.el 2013-11-17 04:22:24 +0000 @@ -146,6 +146,7 @@ (declare-function calc-set-language "calc-lang" (lang &optional option no-refresh)) (declare-function calc-edit-finish "calc-yank" (&optional keep)) (declare-function calc-edit-cancel "calc-yank" ()) +(declare-function calc-locate-cursor-element "calc-yank" (pt)) (declare-function calc-do-quick-calc "calc-aent" ()) (declare-function calc-do-calc-eval "calc-aent" (str separator args)) (declare-function calc-do-keypad "calc-keypd" (&optional full-display interactive)) @@ -426,6 +427,13 @@ :version "24.3" :type 'boolean) +(defcustom calc-context-sensitive-enter + nil + "If non-nil, the stack element under the cursor will be copied by `calc-enter'." + :group 'calc + :version "24.4" + :type 'boolean) + (defcustom calc-undo-length 100 "The number of undo steps that will be preserved when Calc is quit." @@ -2257,8 +2265,10 @@ ((= n 0) (calc-push-list (calc-top-list (calc-stack-size)))) (t - (calc-push-list (calc-top-list n)))))) - + (if (not calc-context-sensitive-enter) + (calc-push-list (calc-top-list n)) + (let ((num (max 1 (calc-locate-cursor-element (point))))) + (calc-push-list (calc-top-list n num)))))))) (defun calc-pop (n) (interactive "P") ------------------------------------------------------------ revno: 115126 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-11-16 19:58:30 -0800 message: * configure.ac (DEBUGGER_SEES_C_MACROS): Remove. * src/lisp.h (DEBUGGER_SEES_C_MACROS): Likewise. It apparently doesn't work for GCC 3, and I suppose it's more trouble than it's worth to worry about this. diff: === modified file 'ChangeLog' --- ChangeLog 2013-11-15 01:59:57 +0000 +++ ChangeLog 2013-11-17 03:58:30 +0000 @@ -1,3 +1,9 @@ +2013-11-17 Paul Eggert + + * configure.ac (DEBUGGER_SEES_C_MACROS): Remove. + It apparently doesn't work for GCC 3, and I suppose it's more + trouble than it's worth to worry about this. + 2013-11-15 Paul Eggert * configure.ac (DEBUGGER_SEES_C_MACROS): New macro. === modified file 'configure.ac' --- configure.ac 2013-11-15 01:59:57 +0000 +++ configure.ac 2013-11-17 03:58:30 +0000 @@ -697,16 +697,6 @@ esac fi -for flag in $CFLAGS -; do - case $flag in - -g*3) - AC_DEFINE([DEBUGGER_SEES_C_MACROS], 1, - [Define to 1 if C macros are visible to the debugger, as with - GCC's -g3 option.]) - break;; - esac -done - AC_ARG_ENABLE([gcc-warnings], [AS_HELP_STRING([--enable-gcc-warnings], [turn on lots of GCC warnings/errors. This is intended for === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-16 10:23:09 +0000 +++ src/ChangeLog 2013-11-17 03:58:30 +0000 @@ -1,3 +1,7 @@ +2013-11-17 Paul Eggert + + * lisp.h (DEBUGGER_SEES_C_MACROS): Remove. + 2013-11-16 Eli Zaretskii * doc.c (Fsubstitute_command_keys): Inhibit modification hooks === modified file 'src/lisp.h' --- src/lisp.h 2013-11-15 08:18:37 +0000 +++ src/lisp.h 2013-11-17 03:58:30 +0000 @@ -45,14 +45,7 @@ definitions visible to the debugger. It's used for symbols that .gdbinit needs, symbols whose values may not fit in 'int' (where an enum would suffice). */ -#if defined DEBUGGER_SEES_C_MACROS && defined __GNUC__ -/* GCC versions before 3.5 have unreliable support for C macros in - debug info. */ -# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 5) -# undef DEBUGGER_SEES_C_MACROS -# endif -#endif -#if defined MAIN_PROGRAM && !defined DEBUGGER_SEES_C_MACROS +#if defined MAIN_PROGRAM # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE # define DEFINE_GDB_SYMBOL_END(id) = id; #else ------------------------------------------------------------ revno: 115125 committer: Ted Zlatanov branch nick: quickfixes timestamp: Sat 2013-11-16 17:36:14 -0500 message: Add CFEngine 3 ElDoc, completion, and compilation glue to cf-promises. * progmodes/cfengine.el: Version bump. (cfengine-cf-promises): New defcustom to locate cf-promises. (cfengine3-vartypes): Add new "data" type. (cfengine3--current-word): New function to get current name-like word or its bounds. (cfengine3--current-function): New function to look up a CFEngine function's definition. (cfengine3-format-function-docstring): New function. (cfengine3-make-syntax-cache): New function. (cfengine3-documentation-function): New function: ElDoc glue. (cfengine3-completion-function): New function: completion glue. (cfengine3-mode): Set `compile-command', `eldoc-documentation-function', and add to `completion-at-point-functions'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-16 11:37:45 +0000 +++ lisp/ChangeLog 2013-11-16 22:36:14 +0000 @@ -1,3 +1,20 @@ +2013-11-16 Teodor Zlatanov + + * progmodes/cfengine.el: Version bump. + (cfengine-cf-promises): New defcustom to locate cf-promises. + (cfengine3-vartypes): Add new "data" type. + (cfengine3--current-word): New function to get current name-like + word or its bounds. + (cfengine3--current-function): New function to look up a CFEngine + function's definition. + (cfengine3-format-function-docstring): New function. + (cfengine3-make-syntax-cache): New function. + (cfengine3-documentation-function): New function: ElDoc glue. + (cfengine3-completion-function): New function: completion glue. + (cfengine3-mode): Set `compile-command', + `eldoc-documentation-function', and add to + `completion-at-point-functions'. + 2013-11-16 Michael Albinus * net/tramp-cmds.el (tramp-cleanup-connection): Clean up === modified file 'lisp/progmodes/cfengine.el' --- lisp/progmodes/cfengine.el 2013-07-10 14:34:13 +0000 +++ lisp/progmodes/cfengine.el 2013-11-16 22:36:14 +0000 @@ -5,7 +5,7 @@ ;; Author: Dave Love ;; Maintainer: Ted Zlatanov ;; Keywords: languages -;; Version: 1.2 +;; Version: 1.3 ;; This file is part of GNU Emacs. @@ -45,6 +45,10 @@ ;; (add-to-list 'auto-mode-alist '("^cf\\." . cfengine2-mode)) ;; (add-to-list 'auto-mode-alist '("^cfagent.conf\\'" . cfengine2-mode)) +;; It's *highly* recommended that you enable the eldoc minor mode: + +;; (add-hook 'cfengine-mode-hook 'turn-on-eldoc-mode) + ;; This is not the same as the mode written by Rolf Ebert ;; , distributed with cfengine-2.0.5. It does ;; better fontification and indentation, inter alia. @@ -60,6 +64,18 @@ :group 'cfengine :type 'integer) +(defcustom cfengine-cf-promises + (or (executable-find "cf-promises") + (executable-find "/var/cfengine/bin/cf-promises") + (executable-find "/usr/bin/cf-promises") + (executable-find "/usr/local/bin/cf-promises") + (executable-find "~/bin/cf-promises")) + "The location of the cf-promises executable. +Used for syntax discovery and checking. Set to nil to disable +the `compile-command' override and the ElDoc support." + :group 'cfengine + :type 'file) + (defcustom cfengine-parameters-indent '(promise pname 0) "*Indentation of CFEngine3 promise parameters (hanging indent). @@ -127,6 +143,9 @@ (defvar cfengine-mode-debug nil "Whether `cfengine-mode' should print debugging info.") +(defvar cfengine-mode-syntax-cache nil + "Cache for `cfengine-mode' syntax trees obtained from 'cf-promises -s json'.") + (defcustom cfengine-mode-abbrevs nil "Abbrevs for CFEngine2 mode." :group 'cfengine @@ -167,7 +186,7 @@ (defconst cfengine3-vartypes (mapcar 'symbol-name - '(string int real slist ilist rlist irange rrange counter)) + '(string int real slist ilist rlist irange rrange counter data)) "List of the CFEngine 3.x variable types.")) (defvar cfengine2-font-lock-keywords @@ -501,6 +520,116 @@ ;; CLASS: [.|&!()a-zA-Z0-9_\200-\377]+:: ;; CATEGORY: [a-zA-Z_]+: +(defun cfengine3--current-word (&optional bounds) + "Propose a word around point in the current CFEngine 3 buffer." + (let ((c (char-after (point))) + (s (syntax-ppss))) + (when (not (nth 3 s)) ; not inside a string + (if bounds + (save-excursion + (let ((oldpoint (point)) + start end) + (skip-syntax-backward "w_") (setq start (point)) + (goto-char oldpoint) + (skip-syntax-forward "w_") (setq end (point)) + (when (not (and (eq start oldpoint) + (eq end oldpoint))) + (list start (point))))) + (and c + (memq (char-syntax c) '(?_ ?w)) + (current-word)))))) + +(defun cfengine3--current-function () + "Look up current CFEngine 3 function" + (let* ((syntax (assoc cfengine-cf-promises cfengine-mode-syntax-cache)) + (flist (assoc 'functions syntax))) + (when flist + (let ((w (cfengine3--current-word))) + (and w (assq (intern w) flist)))))) + +;; format from "cf-promises -s json", e.g. "sort" function: +;; ((category . "data") +;; (variadic . :json-false) +;; (parameters . [((range . "[a-zA-Z0-9_$(){}\\[\\].:]+") (type . "string")) +;; ((range . "lex,int,real,IP,ip,MAC,mac") (type . "option"))]) +;; (returnType . "slist") +;; (status . "normal")) + +(defun cfengine3-format-function-docstring (fdef) + (let* ((f (format "%s" (car-safe fdef))) + (def (cdr fdef)) + (rtype (cdr (assq 'returnType def))) + (plist (cdr (assq 'parameters def))) + (has-some-parameters (> (length plist) 0)) + (variadic (eq t (cdr (assq 'variadic def))))) + + ;; (format "[%S]%s %s(%s%s)" def + (format "%s %s(%s%s)" + (if rtype + (propertize rtype 'face 'font-lock-variable-name-face) + "???") + (propertize f 'face 'font-lock-function-name-face) + (mapconcat (lambda (p) + (let ((type (cdr (assq 'type p))) + (range (cdr (assq 'range p)))) + (cond + ((not (stringp type)) "???type???") + ((not (stringp range)) "???range???") + ;; options are lists of possible keywords + ((equal type "option") + (propertize (concat "[" range "]") + 'face + 'font-lock-keyword-face)) + ;; anything else is a type name as a variable + (t (propertize type + 'face + 'font-lock-variable-name-face))))) + plist + ", ") + (if variadic + (if has-some-parameters ", ..." "...") + "")))) + +(defun cfengine3-make-syntax-cache () + "Build the CFEngine 3 syntax cache. +Calls `cfengine-cf-promises' with \"-s json\"" + (when cfengine-cf-promises + (let ((loaded-json-lib (require 'json nil t)) + (syntax (assoc cfengine-cf-promises cfengine-mode-syntax-cache))) + (if (not loaded-json-lib) + (message "JSON library could not be loaded!") + (unless syntax + (with-demoted-errors + (with-temp-buffer + (call-process-shell-command cfengine-cf-promises + nil ; no input + t ; current buffer + nil ; no redisplay + "-s" "json") + (goto-char (point-min)) + (setq syntax (json-read)) + (setq cfengine-mode-syntax-cache + (cons (cons cfengine-cf-promises syntax) + cfengine-mode-syntax-cache))))))))) + +(defun cfengine3-documentation-function () + "Document CFengine 3 functions around point. +Intended as the value of `eldoc-documentation-function', which +see. Use it by executing `turn-on-eldoc-mode'." + (cfengine3-make-syntax-cache) + (let ((fdef (cfengine3--current-function))) + (when fdef + (cfengine3-format-function-docstring fdef)))) + +(defun cfengine3-completion-function () + "Return completions for function name around or before point." + (cfengine3-make-syntax-cache) + (let* ((bounds (cfengine3--current-word t)) + (syntax (assoc cfengine-cf-promises cfengine-mode-syntax-cache)) + (flist (assoc 'functions syntax))) + (when bounds + (append bounds (list (cdr flist)))))) + (defun cfengine-common-settings () (set (make-local-variable 'syntax-propertize-function) ;; In the main syntax-table, \ is marked as a punctuation, because @@ -549,6 +678,21 @@ nil nil nil beginning-of-defun)) (setq-local prettify-symbols-alist cfengine3--prettify-symbols-alist) + ;; `compile-command' is almost never a `make' call with CFEngine so + ;; we override it + (when cfengine-cf-promises + (set (make-local-variable 'compile-command) + (concat cfengine-cf-promises + " -f " + (when buffer-file-name + (shell-quote-argument buffer-file-name))))) + + (set (make-local-variable 'eldoc-documentation-function) + #'cfengine3-documentation-function) + + (add-hook 'completion-at-point-functions + #'cfengine3-completion-function nil t) + ;; Use defuns as the essential syntax block. (set (make-local-variable 'beginning-of-defun-function) #'cfengine3-beginning-of-defun) ------------------------------------------------------------ revno: 115124 committer: Barry O'Reilly branch nick: trunk timestamp: Sat 2013-11-16 15:30:18 -0500 message: Fix ChangeLog in last commit. diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2013-11-16 20:27:24 +0000 +++ lisp/cedet/ChangeLog 2013-11-16 20:30:18 +0000 @@ -1,4 +1,4 @@ -2013-10-28 Barry O'Reilly +2013-11-16 Barry O'Reilly * semantic/fw.el (semantic-exit-on-input) (semantic-throw-on-input): Restore point before ------------------------------------------------------------ revno: 115123 fixes bug: http://debbugs.gnu.org/15045 committer: Barry O'Reilly branch nick: trunk timestamp: Sat 2013-11-16 15:27:24 -0500 message: * semantic/fw.el (semantic-exit-on-input) (semantic-throw-on-input): Restore point before accept-process-output because timers which redisplay can run. (Bug#15045) diff: === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2013-11-03 21:51:25 +0000 +++ lisp/cedet/ChangeLog 2013-11-16 20:27:24 +0000 @@ -1,3 +1,10 @@ +2013-10-28 Barry O'Reilly + + * semantic/fw.el (semantic-exit-on-input) + (semantic-throw-on-input): Restore point before + accept-process-output because timers which redisplay can run. + (Bug#15045) + 2013-11-03 Johan Bockgård * semantic/lex.el (semantic-lex-start-block) === modified file 'lisp/cedet/semantic/fw.el' --- lisp/cedet/semantic/fw.el 2013-09-20 17:21:28 +0000 +++ lisp/cedet/semantic/fw.el 2013-11-16 20:27:24 +0000 @@ -369,6 +369,8 @@ ;; (defvar semantic-current-input-throw-symbol nil "The current throw symbol for `semantic-exit-on-input'.") +(defvar semantic--on-input-start-marker nil + "The marker when starting a semantic-exit-on-input form.") (defmacro semantic-exit-on-input (symbol &rest forms) "Using SYMBOL as an argument to `throw', execute FORMS. @@ -376,7 +378,8 @@ if a user presses any key during execution, this form macro will exit with the value passed to `semantic-throw-on-input'. If FORMS completes, then the return value is the same as `progn'." - `(let ((semantic-current-input-throw-symbol ,symbol)) + `(let ((semantic-current-input-throw-symbol ,symbol) + (semantic--on-input-start-marker (point-marker))) (catch ,symbol ,@forms))) (put 'semantic-exit-on-input 'lisp-indent-function 1) @@ -387,7 +390,16 @@ to pass to `throw'. It is recommended to use the name of the function calling this one." `(when (and semantic-current-input-throw-symbol - (or (input-pending-p) (accept-process-output))) + (or (input-pending-p) + (save-excursion + ;; Timers might run during accept-process-output. + ;; If they redisplay, point must be where the user + ;; expects. (Bug#15045) + (set-buffer (marker-buffer + semantic--on-input-start-marker)) + (goto-char (marker-position + semantic--on-input-start-marker)) + (accept-process-output)))) (throw semantic-current-input-throw-symbol ,from))) ------------------------------------------------------------ revno: 115122 committer: Michael Albinus branch nick: trunk timestamp: Sat 2013-11-16 12:46:37 +0100 message: * automated/tramp-tests.el (tramp-test07-file-exists-p) (tramp-test08-file-local-copy) (tramp-test09-insert-file-contents, tramp-test10-write-region) (tramp-test11-copy-file, tramp-test12-rename-file) (tramp-test13-make-directory, tramp-test14-delete-directory) (tramp-test15-copy-directory, tramp-test16-directory-files) (tramp-test17-insert-directory, tramp-test18-file-attributes) (tramp-test19-directory-files-and-attributes) (tramp-test20-file-modes, tramp-test21-file-links) (tramp-test22-file-times, tramp-test23-visited-file-modtime) (tramp-test24-file-name-completion, tramp-test25-load) (tramp-test26-process-file, tramp-test27-start-file-process) (tramp-test28-shell-command): Cleanup connection initially. diff: === modified file 'test/ChangeLog' --- test/ChangeLog 2013-11-15 13:49:17 +0000 +++ test/ChangeLog 2013-11-16 11:46:37 +0000 @@ -1,3 +1,19 @@ +2013-11-16 Michael Albinus + + * automated/tramp-tests.el (tramp-test07-file-exists-p) + (tramp-test08-file-local-copy) + (tramp-test09-insert-file-contents, tramp-test10-write-region) + (tramp-test11-copy-file, tramp-test12-rename-file) + (tramp-test13-make-directory, tramp-test14-delete-directory) + (tramp-test15-copy-directory, tramp-test16-directory-files) + (tramp-test17-insert-directory, tramp-test18-file-attributes) + (tramp-test19-directory-files-and-attributes) + (tramp-test20-file-modes, tramp-test21-file-links) + (tramp-test22-file-times, tramp-test23-visited-file-modtime) + (tramp-test24-file-name-completion, tramp-test25-load) + (tramp-test26-process-file, tramp-test27-start-file-process) + (tramp-test28-shell-command): Cleanup connection initially. + 2013-11-15 Michael Albinus * automated/tramp-tests.el (tramp-test29-utf8): Cleanup the === modified file 'test/automated/tramp-tests.el' --- test/automated/tramp-tests.el 2013-11-15 13:49:17 +0000 +++ test/automated/tramp-tests.el 2013-11-16 11:46:37 +0000 @@ -549,6 +549,10 @@ (ert-deftest tramp-test07-file-exists-p () "Check `file-exist-p', `write-region' and `delete-file'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (should-not (file-exists-p tmp-name)) (write-region "foo" nil tmp-name) @@ -559,6 +563,10 @@ (ert-deftest tramp-test08-file-local-copy () "Check `file-local-copy'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name1 (tramp--test-make-temp-name)) tmp-name2) (unwind-protect @@ -575,6 +583,10 @@ (ert-deftest tramp-test09-insert-file-contents () "Check `insert-file-contents'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -595,6 +607,10 @@ (ert-deftest tramp-test10-write-region () "Check `write-region'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -628,6 +644,10 @@ (ert-deftest tramp-test11-copy-file () "Check `copy-file'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (tramp--test-make-temp-name))) (unwind-protect @@ -645,6 +665,10 @@ (ert-deftest tramp-test12-rename-file () "Check `rename-file'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (tramp--test-make-temp-name))) (unwind-protect @@ -662,6 +686,10 @@ "Check `make-directory'. This tests also `file-directory-p' and `file-accessible-directory-p'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -673,6 +701,10 @@ (ert-deftest tramp-test14-delete-directory () "Check `delete-directory'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) ;; Delete empty directory. (make-directory tmp-name) @@ -689,6 +721,10 @@ (ert-deftest tramp-test15-copy-directory () "Check `copy-directory'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let* ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (tramp--test-make-temp-name)) (tmp-name3 (expand-file-name @@ -717,6 +753,10 @@ (ert-deftest tramp-test16-directory-files () "Check `directory-files'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let* ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (expand-file-name "bla" tmp-name1)) (tmp-name3 (expand-file-name "foo" tmp-name1))) @@ -744,6 +784,10 @@ (ert-deftest tramp-test17-insert-directory () "Check `insert-directory'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let* ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (expand-file-name "foo" tmp-name1))) (unwind-protect @@ -777,6 +821,10 @@ "Check `file-attributes'. This tests also `file-readable-p' and `file-regular-p'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name)) attr) (unwind-protect @@ -818,6 +866,10 @@ (ert-deftest tramp-test19-directory-files-and-attributes () "Check `directory-files-and-attributes'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name)) attr) (unwind-protect @@ -845,6 +897,10 @@ "Check `file-modes'. This tests also `file-executable-p', `file-writable-p' and `set-file-modes'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -866,6 +922,10 @@ "Check `file-symlink-p'. This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (tramp--test-make-temp-name)) (tmp-name3 (make-temp-name "tramp-"))) @@ -915,6 +975,10 @@ (ert-deftest tramp-test22-file-times () "Check `set-file-times' and `file-newer-than-file-p'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name1 (tramp--test-make-temp-name)) (tmp-name2 (tramp--test-make-temp-name)) (tmp-name3 (tramp--test-make-temp-name))) @@ -939,6 +1003,10 @@ (ert-deftest tramp-test23-visited-file-modtime () "Check `set-visited-file-modtime' and `verify-visited-file-modtime'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -955,6 +1023,10 @@ (ert-deftest tramp-test24-file-name-completion () "Check `file-name-completion' and `file-name-all-completions'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -976,6 +1048,10 @@ (ert-deftest tramp-test25-load () "Check `load'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name))) (unwind-protect (progn @@ -993,6 +1069,10 @@ (ert-deftest tramp-test26-process-file () "Check `process-file'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name)) (default-directory tramp-test-temporary-file-directory)) (unwind-protect @@ -1011,6 +1091,10 @@ (ert-deftest tramp-test27-start-file-process () "Check `start-file-process'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((default-directory tramp-test-temporary-file-directory) (tmp-name (tramp--test-make-temp-name)) kill-buffer-query-functions proc) @@ -1055,6 +1139,10 @@ (ert-deftest tramp-test28-shell-command () "Check `shell-command'." (skip-unless (tramp--test-enabled)) + (tramp-cleanup-connection + (tramp-dissect-file-name tramp-test-temporary-file-directory) + nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name)) (default-directory tramp-test-temporary-file-directory)) (unwind-protect @@ -1067,10 +1155,10 @@ (ert-deftest tramp-test29-utf8 () "Check UTF8 encoding in file names and file contents." (skip-unless (tramp--test-enabled)) - ;; TODO: It shall be possible to call it in every test. (tramp-cleanup-connection (tramp-dissect-file-name tramp-test-temporary-file-directory) nil 'keep-password) + (let ((tmp-name (tramp--test-make-temp-name)) (arabic "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") (chinese "银河系漫游指南系列") @@ -1086,7 +1174,7 @@ (with-temp-buffer (insert-file-contents file) (should (string-equal (buffer-string) lang))))) - ;; Check file name. + ;; Check file names. (should (equal (directory-files tmp-name nil directory-files-no-dot-files-regexp) (sort `(,arabic ,chinese ,russian) 'string-lessp)))) ------------------------------------------------------------ revno: 115121 committer: Michael Albinus branch nick: trunk timestamp: Sat 2013-11-16 12:37:45 +0100 message: * net/tramp-cmds.el (tramp-cleanup-connection): Clean up `tramp-current-connection'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-15 18:09:10 +0000 +++ lisp/ChangeLog 2013-11-16 11:37:45 +0000 @@ -1,3 +1,8 @@ +2013-11-16 Michael Albinus + + * net/tramp-cmds.el (tramp-cleanup-connection): Clean up + `tramp-current-connection'. + 2013-11-15 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2013-10-17 19:39:22 +0000 +++ lisp/net/tramp-cmds.el 2013-11-16 11:37:45 +0000 @@ -85,6 +85,10 @@ ;; Nothing to do. (message "No Tramp connection found.") + ;; Cleanup `tramp-current-connection'. Otherwise, we would be + ;; suppressed in the test suite. + (setq tramp-current-connection nil) + ;; Flush password cache. (unless keep-password (tramp-clear-passwd vec)) ------------------------------------------------------------ revno: 115120 fixes bug: http://debbugs.gnu.org/15907 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-16 12:23:09 +0200 message: Don't let unusual after-change-functions overwrite " prin1" buffer in use. src/doc.c (Fsubstitute_command_keys): Inhibit modification hooks while we are using Vprin1_to_string_buffer. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-16 09:27:19 +0000 +++ src/ChangeLog 2013-11-16 10:23:09 +0000 @@ -1,5 +1,8 @@ 2013-11-16 Eli Zaretskii + * doc.c (Fsubstitute_command_keys): Inhibit modification hooks + while we are using Vprin1_to_string_buffer. + * keymap.c (describe_map): Don't crash if PT is 1 both before and after inserting the description string. (Bug#15907) === modified file 'src/doc.c' --- src/doc.c 2013-08-11 01:30:20 +0000 +++ src/doc.c 2013-11-16 10:23:09 +0000 @@ -850,6 +850,7 @@ /* This is for computing the SHADOWS arg for describe_map_tree. */ Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil); Lisp_Object earlier_maps; + ptrdiff_t count = SPECPDL_INDEX (); changed = 1; strp += 2; /* skip \{ or \< */ @@ -886,6 +887,10 @@ /* Now switch to a temp buffer. */ oldbuf = current_buffer; set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); + /* This is for an unusual case where some after-change + function uses 'format' or 'prin1' or something else that + will thrash Vprin1_to_string_buffer we are using. */ + specbind (Qinhibit_modification_hooks, Qt); if (NILP (tem)) { @@ -910,6 +915,7 @@ tem = Fbuffer_string (); Ferase_buffer (); set_buffer_internal (oldbuf); + unbind_to (count, Qnil); subst_string: start = SDATA (tem); ------------------------------------------------------------ revno: 115119 fixes bug: http://debbugs.gnu.org/15907 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-16 11:27:19 +0200 message: Fix bug #15907 with crashes due to after-change-functions. src/keymap.c (describe_map): Don't crash if PT is 1 both before and after inserting the description string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-15 18:01:04 +0000 +++ src/ChangeLog 2013-11-16 09:27:19 +0000 @@ -1,3 +1,8 @@ +2013-11-16 Eli Zaretskii + + * keymap.c (describe_map): Don't crash if PT is 1 both before and + after inserting the description string. (Bug#15907) + 2013-11-15 Paul Eggert * data.c: Work around bogus GCC diagnostic about shift count. === modified file 'src/keymap.c' --- src/keymap.c 2013-08-11 01:30:20 +0000 +++ src/keymap.c 2013-11-16 09:27:19 +0000 @@ -3383,9 +3383,12 @@ if (vect[i].shadowed) { - SET_PT (PT - 1); + ptrdiff_t pt = max (PT - 1, BEG); + + SET_PT (pt); insert_string ("\n (that binding is currently shadowed by another mode)"); - SET_PT (PT + 1); + pt = min (PT + 1, Z); + SET_PT (pt); } }