diff options
| author | Paul Eggert | 2012-10-04 22:57:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-10-04 22:57:24 -0700 |
| commit | 735135f9bc3c01b91ffef7c418dd9281bc347ab7 (patch) | |
| tree | 94c73a545a14f064a9e30559089769f60dfbbf34 | |
| parent | be636386220e8a73b57b03572c625fa92bcf199a (diff) | |
| download | emacs-735135f9bc3c01b91ffef7c418dd9281bc347ab7.tar.gz emacs-735135f9bc3c01b91ffef7c418dd9281bc347ab7.zip | |
Spelling fixes.
42 files changed, 96 insertions, 102 deletions
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index 95ac8a07307..f84a414b46e 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy | |||
| @@ -212,7 +212,7 @@ section-dictionary | |||
| 212 | ; | 212 | ; |
| 213 | 213 | ||
| 214 | dictionary-entry-list | 214 | dictionary-entry-list |
| 215 | : ;; emtpy | 215 | : ;; empty |
| 216 | () | 216 | () |
| 217 | | dictionary-entry-list dictionary-entry | 217 | | dictionary-entry-list dictionary-entry |
| 218 | (append $1 $2) | 218 | (append $1 $2) |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 2313d117a90..90bfcf147c5 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -1065,7 +1065,7 @@ present. | |||
| 1065 | Type @kbd{M-x delete-trailing-whitespace} to delete all trailing | 1065 | Type @kbd{M-x delete-trailing-whitespace} to delete all trailing |
| 1066 | whitespace. This command deletes all extra spaces at the end of each | 1066 | whitespace. This command deletes all extra spaces at the end of each |
| 1067 | line in the buffer, and all empty lines at the end of the buffer; to | 1067 | line in the buffer, and all empty lines at the end of the buffer; to |
| 1068 | ignore the latter, change the varaible @code{delete-trailing-lines} to | 1068 | ignore the latter, change the variable @code{delete-trailing-lines} to |
| 1069 | @code{nil}. If the region is active, the command instead deletes | 1069 | @code{nil}. If the region is active, the command instead deletes |
| 1070 | extra spaces at the end of each line in the region. | 1070 | extra spaces at the end of each line in the region. |
| 1071 | 1071 | ||
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 93dba237013..9ffa2b74857 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi | |||
| @@ -1952,7 +1952,7 @@ position such events have. | |||
| 1952 | 1952 | ||
| 1953 | @defun posnp object | 1953 | @defun posnp object |
| 1954 | This function returns non-@code{nil} if @var{object} is a mouse | 1954 | This function returns non-@code{nil} if @var{object} is a mouse |
| 1955 | oposition list, in either of the formats documented in @ref{Click | 1955 | position list, in either of the formats documented in @ref{Click |
| 1956 | Events}); and @code{nil} otherwise. | 1956 | Events}); and @code{nil} otherwise. |
| 1957 | @end defun | 1957 | @end defun |
| 1958 | 1958 | ||
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index b7b26c8708c..b28ed6e84c4 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi | |||
| @@ -148,7 +148,7 @@ The message is @samp{No catch for tag}. @xref{Catch and Throw}. | |||
| 148 | @ignore | 148 | @ignore |
| 149 | @c Not actually used for anything? Probably definition should be removed. | 149 | @c Not actually used for anything? Probably definition should be removed. |
| 150 | @item protected-field | 150 | @item protected-field |
| 151 | The message is @samp{Attempt to modify a protected fiel. | 151 | The message is @samp{Attempt to modify a protected file}. |
| 152 | @end ignore | 152 | @end ignore |
| 153 | 153 | ||
| 154 | @item scan-error | 154 | @item scan-error |
| @@ -205,7 +205,7 @@ of @code{domain-error}. | |||
| 205 | The message is @code{Arithmetic range error}. | 205 | The message is @code{Arithmetic range error}. |
| 206 | 206 | ||
| 207 | @item singularity-error | 207 | @item singularity-error |
| 208 | The mssage is @samp{Arithmetic singularity error}. This is a | 208 | The message is @samp{Arithmetic singularity error}. This is a |
| 209 | subcategory of @code{domain-error}. | 209 | subcategory of @code{domain-error}. |
| 210 | 210 | ||
| 211 | @item underflow-error | 211 | @item underflow-error |
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index b0e149b09b6..046cdc99414 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi | |||
| @@ -302,7 +302,7 @@ that file to your target. | |||
| 302 | . a myprogram RET | 302 | . a myprogram RET |
| 303 | @end example | 303 | @end example |
| 304 | 304 | ||
| 305 | Note that these promps often have completion, so you can just press | 305 | Note that these prompts often have completion, so you can just press |
| 306 | @kbd{TAB} to complete the name @file{myprogram}. | 306 | @kbd{TAB} to complete the name @file{myprogram}. |
| 307 | 307 | ||
| 308 | If you had many files to add to the same target, you could mark them | 308 | If you had many files to add to the same target, you could mark them |
| @@ -785,7 +785,7 @@ also supports several debugging tools via @file{android.el}. | |||
| 785 | An arduino project of type @samp{ede-arduino-project} will read your | 785 | An arduino project of type @samp{ede-arduino-project} will read your |
| 786 | @file{~/.arduino/preferences.txt} file, and identify your sketches. | 786 | @file{~/.arduino/preferences.txt} file, and identify your sketches. |
| 787 | You will still need the Arduino IDE to set up your preferences and | 787 | You will still need the Arduino IDE to set up your preferences and |
| 788 | locate your arduino. After quiting the IDE, Emacs will be able to | 788 | locate your arduino. After quitting the IDE, Emacs will be able to |
| 789 | find your sketches, compile them, and upload them to your arduino. | 789 | find your sketches, compile them, and upload them to your arduino. |
| 790 | 790 | ||
| 791 | If you have the @file{arduino} command on your path, @ede{} will be | 791 | If you have the @file{arduino} command on your path, @ede{} will be |
| @@ -1169,14 +1169,14 @@ Some example project types are: | |||
| 1169 | 1169 | ||
| 1170 | @table @code | 1170 | @table @code |
| 1171 | @item project-am | 1171 | @item project-am |
| 1172 | Autmake project which reads existing Automake files. | 1172 | Automake project which reads existing Automake files. |
| 1173 | @item ede-proj-project | 1173 | @item ede-proj-project |
| 1174 | This project type will create @file{Makefiles}, | 1174 | This project type will create @file{Makefiles}, |
| 1175 | or @file{Makefile.am} files to compile your project. | 1175 | or @file{Makefile.am} files to compile your project. |
| 1176 | @item ede-linux | 1176 | @item ede-linux |
| 1177 | This project type will detect linux source trees. | 1177 | This project type will detect linux source trees. |
| 1178 | @item ede-emacs | 1178 | @item ede-emacs |
| 1179 | This proejct will detect an Emacs source tree. | 1179 | This project will detect an Emacs source tree. |
| 1180 | @end table | 1180 | @end table |
| 1181 | 1181 | ||
| 1182 | There are several other project types as well. | 1182 | There are several other project types as well. |
| @@ -1291,7 +1291,7 @@ it finds the top of the project. It does this by calling | |||
| 1291 | @code{ede-toplevel-project}. If this hasn't already been discovered, | 1291 | @code{ede-toplevel-project}. If this hasn't already been discovered, |
| 1292 | the directories as scanned upward one at a time until a directory with | 1292 | the directories as scanned upward one at a time until a directory with |
| 1293 | no project is found. The last found project becomes the project | 1293 | no project is found. The last found project becomes the project |
| 1294 | root. If the ofund instance of @code{ede-project-autoload} has a | 1294 | root. If the found instance of @code{ede-project-autoload} has a |
| 1295 | valid @code{proj-root} slot value, then that function is called instead | 1295 | valid @code{proj-root} slot value, then that function is called instead |
| 1296 | of scanning the project by hand. Some project types have a short-cut | 1296 | of scanning the project by hand. Some project types have a short-cut |
| 1297 | for determining the root of a project, so this comes in handy. | 1297 | for determining the root of a project, so this comes in handy. |
| @@ -3331,7 +3331,7 @@ Bonus: Return a cons cell: (COMPILED . UPTODATE). | |||
| 3331 | @end deffn | 3331 | @end deffn |
| 3332 | 3332 | ||
| 3333 | @deffn Method ede-proj-flush-autoconf :AFTER this | 3333 | @deffn Method ede-proj-flush-autoconf :AFTER this |
| 3334 | Flush the configure file (current buffer) to accomodate @var{THIS}. | 3334 | Flush the configure file (current buffer) to accommodate @var{THIS}. |
| 3335 | @end deffn | 3335 | @end deffn |
| 3336 | 3336 | ||
| 3337 | @deffn Method ede-buffer-mine :AFTER this buffer | 3337 | @deffn Method ede-buffer-mine :AFTER this buffer |
| @@ -3920,7 +3920,7 @@ Return the default macro to 'edit' for this object type. | |||
| 3920 | @end deffn | 3920 | @end deffn |
| 3921 | 3921 | ||
| 3922 | @deffn Method project-compile-target-command :AFTER this | 3922 | @deffn Method project-compile-target-command :AFTER this |
| 3923 | Default target t- use when compling a texinfo file. | 3923 | Default target to use when compiling a texinfo file. |
| 3924 | @end deffn | 3924 | @end deffn |
| 3925 | 3925 | ||
| 3926 | @deffn Method ede-documentation :AFTER this | 3926 | @deffn Method ede-documentation :AFTER this |
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index 9f3625e180f..6b3a87f19fc 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi | |||
| @@ -595,7 +595,7 @@ This is the default. | |||
| 595 | @item :depth-first | 595 | @item :depth-first |
| 596 | Search for methods in the class hierarchy in a depth first order. | 596 | Search for methods in the class hierarchy in a depth first order. |
| 597 | @item :c3 | 597 | @item :c3 |
| 598 | Searches for methods in in a learnarized way that most closely matches | 598 | Searches for methods in in a linearized way that most closely matches |
| 599 | what CLOS does when a monotonic class structure is defined. | 599 | what CLOS does when a monotonic class structure is defined. |
| 600 | @end table | 600 | @end table |
| 601 | 601 | ||
| @@ -1010,7 +1010,7 @@ This is the default. | |||
| 1010 | @item :depth-first | 1010 | @item :depth-first |
| 1011 | Search for methods in the class hierarchy in a depth first order. | 1011 | Search for methods in the class hierarchy in a depth first order. |
| 1012 | @item :c3 | 1012 | @item :c3 |
| 1013 | Searches for methods in in a learnarized way that most closely matches | 1013 | Searches for methods in in a linearized way that most closely matches |
| 1014 | what CLOS does when CLOS when a monotonic class structure is defined. | 1014 | what CLOS does when CLOS when a monotonic class structure is defined. |
| 1015 | 1015 | ||
| 1016 | This is derived from the Dylan language documents by | 1016 | This is derived from the Dylan language documents by |
| @@ -1408,8 +1408,8 @@ provided. | |||
| 1408 | Read a persistent object from @var{filename}, and return it. | 1408 | Read a persistent object from @var{filename}, and return it. |
| 1409 | Signal an error if the object in @var{FILENAME} is not a constructor | 1409 | Signal an error if the object in @var{FILENAME} is not a constructor |
| 1410 | for @var{CLASS}. Optional @var{allow-subclass} says that it is ok for | 1410 | for @var{CLASS}. Optional @var{allow-subclass} says that it is ok for |
| 1411 | @code{eieio-peristent-read} to load in subclasses of class instead of | 1411 | @code{eieio-persistent-read} to load in subclasses of class instead of |
| 1412 | being pendantic." | 1412 | being pedantic. |
| 1413 | @end defun | 1413 | @end defun |
| 1414 | 1414 | ||
| 1415 | @node eieio-named | 1415 | @node eieio-named |
| @@ -1564,9 +1564,9 @@ texinfo format by using the tools in the file @file{eieio-doc.el} | |||
| 1564 | 1564 | ||
| 1565 | @deffn Command eieiodoc-class class indexstring &optional skiplist | 1565 | @deffn Command eieiodoc-class class indexstring &optional skiplist |
| 1566 | 1566 | ||
| 1567 | This will start at the current point, and created an indented menu of | 1567 | This will start at the current point, and create an indented menu of |
| 1568 | all the child classes of, and including @var{class}, but skipping any | 1568 | all the child classes of, and including @var{class}, but skipping any |
| 1569 | classes that might be in @var{skiplist} It will then create nodes for | 1569 | classes that might be in @var{skiplist}. It will then create nodes for |
| 1570 | all these classes, subsection headings, and indexes. | 1570 | all these classes, subsection headings, and indexes. |
| 1571 | 1571 | ||
| 1572 | Each class will be indexed using the texinfo labeled index | 1572 | Each class will be indexed using the texinfo labeled index |
| @@ -1585,7 +1585,7 @@ where @var{indexstring} is replaced with the two letter code. | |||
| 1585 | Next, an inheritance tree will be created listing all parents of that | 1585 | Next, an inheritance tree will be created listing all parents of that |
| 1586 | section's class. | 1586 | section's class. |
| 1587 | 1587 | ||
| 1588 | Then,all the slots will be expanded in tables, and described | 1588 | Then, all the slots will be expanded in tables, and described |
| 1589 | using the documentation strings from the code. Default values will also | 1589 | using the documentation strings from the code. Default values will also |
| 1590 | be displayed. Only those slots with @code{:initarg} specified will be | 1590 | be displayed. Only those slots with @code{:initarg} specified will be |
| 1591 | expanded, others will be hidden. If a slot is inherited from a parent, | 1591 | expanded, others will be hidden. If a slot is inherited from a parent, |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 227af8faf10..89c99018460 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -947,7 +947,7 @@ description on Worg}. | |||
| 947 | Installing Info files is system dependent, because of differences in the | 947 | Installing Info files is system dependent, because of differences in the |
| 948 | @file{install-info} program. The Info documentation is installed together | 948 | @file{install-info} program. The Info documentation is installed together |
| 949 | with the rest of Org mode. If you don't install Org mode, it is possible to | 949 | with the rest of Org mode. If you don't install Org mode, it is possible to |
| 950 | install the Info documentation seperately (you need to have | 950 | install the Info documentation separately (you need to have |
| 951 | install-info@footnote{The output from install-info (if any) is system | 951 | install-info@footnote{The output from install-info (if any) is system |
| 952 | dependent. In particular Debian and its derivatives use two different | 952 | dependent. In particular Debian and its derivatives use two different |
| 953 | versions of install-info and you may see the message: | 953 | versions of install-info and you may see the message: |
| @@ -2671,13 +2671,13 @@ durations computations @ref{Durations and time values}. | |||
| 2671 | @cindex Lisp forms, as table formulas | 2671 | @cindex Lisp forms, as table formulas |
| 2672 | 2672 | ||
| 2673 | It is also possible to write a formula in Emacs Lisp. This can be useful | 2673 | It is also possible to write a formula in Emacs Lisp. This can be useful |
| 2674 | for string manipulation and control structures, if Calc's functionality is | 2674 | for string manipulation and control structures, if Calc's functionality is |
| 2675 | not enough. | 2675 | not enough. |
| 2676 | 2676 | ||
| 2677 | If a formula starts with a single-quote followed by an opening parenthesis, | 2677 | If a formula starts with a single-quote followed by an opening parenthesis, |
| 2678 | then it is evaluated as a Lisp form. The evaluation should return either a | 2678 | then it is evaluated as a Lisp form. The evaluation should return either a |
| 2679 | string or a number. Just as with @file{calc} formulas, you can specify modes | 2679 | string or a number. Just as with @file{calc} formulas, you can specify modes |
| 2680 | and a printf format after a semicolon. | 2680 | and a printf format after a semicolon. |
| 2681 | 2681 | ||
| 2682 | With Emacs Lisp forms, you need to be conscious about the way field | 2682 | With Emacs Lisp forms, you need to be conscious about the way field |
| 2683 | references are interpolated into the form. By default, a reference will be | 2683 | references are interpolated into the form. By default, a reference will be |
| @@ -6114,7 +6114,7 @@ is only necessary if you edit the timestamps directly. If you change | |||
| 6114 | them with @kbd{S-@key{cursor}} keys, the update is automatic. | 6114 | them with @kbd{S-@key{cursor}} keys, the update is automatic. |
| 6115 | @orgcmd{C-S-@key{up/down},org-clock-timestamps-up/down} | 6115 | @orgcmd{C-S-@key{up/down},org-clock-timestamps-up/down} |
| 6116 | On @code{CLOCK} log lines, increase/decrease both timestamps so that the | 6116 | On @code{CLOCK} log lines, increase/decrease both timestamps so that the |
| 6117 | clock duration keeps the same. | 6117 | clock duration keeps the same. |
| 6118 | @orgcmd{S-M-@key{up/down},org-timestamp-up/down} | 6118 | @orgcmd{S-M-@key{up/down},org-timestamp-up/down} |
| 6119 | On @code{CLOCK} log lines, increase/decrease the timestamp at point and | 6119 | On @code{CLOCK} log lines, increase/decrease the timestamp at point and |
| 6120 | the one of the previous (or the next clock) timestamp by the same duration. | 6120 | the one of the previous (or the next clock) timestamp by the same duration. |
| @@ -16556,7 +16556,7 @@ rely on outline paths, in the hope that these will be unique enough.}. | |||
| 16556 | Finally, Org writes the file @file{index.org}, containing links to all other | 16556 | Finally, Org writes the file @file{index.org}, containing links to all other |
| 16557 | files. @i{MobileOrg} first reads this file from the server, and then | 16557 | files. @i{MobileOrg} first reads this file from the server, and then |
| 16558 | downloads all agendas and Org files listed in it. To speed up the download, | 16558 | downloads all agendas and Org files listed in it. To speed up the download, |
| 16559 | MobileOrg will only read files whose checksums@footnote{Checksums are stored | 16559 | MobileOrg will only read files whose checksums@footnote{Checksums are stored |
| 16560 | automatically in the file @file{checksums.dat}} have changed. | 16560 | automatically in the file @file{checksums.dat}} have changed. |
| 16561 | 16561 | ||
| 16562 | @node Pulling from MobileOrg, , Pushing to MobileOrg, MobileOrg | 16562 | @node Pulling from MobileOrg, , Pushing to MobileOrg, MobileOrg |
| @@ -16704,7 +16704,7 @@ on @file{org-element.el} and @file{org-export.el} has been outstanding, and | |||
| 16704 | opened the doors for many new ideas and features. | 16704 | opened the doors for many new ideas and features. |
| 16705 | 16705 | ||
| 16706 | @item Jambunathan K | 16706 | @item Jambunathan K |
| 16707 | Jambunathan contributed the ODT exporter, definitly a killer feature of | 16707 | Jambunathan contributed the ODT exporter, definitely a killer feature of |
| 16708 | Org mode. He also contributed the new HTML exporter, which is another core | 16708 | Org mode. He also contributed the new HTML exporter, which is another core |
| 16709 | feature of Org. Here too, I knew I could rely on him to fix bugs in these | 16709 | feature of Org. Here too, I knew I could rely on him to fix bugs in these |
| 16710 | areas and to patiently explain the users what was the problems and solutions. | 16710 | areas and to patiently explain the users what was the problems and solutions. |
| @@ -16712,7 +16712,7 @@ areas and to patiently explain the users what was the problems and solutions. | |||
| 16712 | @item Achim Gratz | 16712 | @item Achim Gratz |
| 16713 | Achim rewrote the building process of Org, turning some @emph{ad hoc} tools | 16713 | Achim rewrote the building process of Org, turning some @emph{ad hoc} tools |
| 16714 | into a flexible and conceptually clean process. He patiently coped with the | 16714 | into a flexible and conceptually clean process. He patiently coped with the |
| 16715 | many hicups that such a change can create for users. | 16715 | many hiccups that such a change can create for users. |
| 16716 | 16716 | ||
| 16717 | @item Nick Dokos | 16717 | @item Nick Dokos |
| 16718 | The Org mode mailing list would not be such a nice place without Nick, who | 16718 | The Org mode mailing list would not be such a nice place without Nick, who |
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 35aab7a0eef..c6851948368 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS | |||
| @@ -65,12 +65,12 @@ See http://orgmode.org/elpa/ | |||
| 65 | 65 | ||
| 66 | *** Org Element | 66 | *** Org Element |
| 67 | 67 | ||
| 68 | =org-element.el= is a toolbox for parsing and analysing "elements" | 68 | =org-element.el= is a toolbox for parsing and analyzing "elements" |
| 69 | in an Org-mode buffer. This has been written by Nicolas Goaziou | 69 | in an Org-mode buffer. This has been written by Nicolas Goaziou |
| 70 | and has been tested for quite some time. It is now part of Org's | 70 | and has been tested for quite some time. It is now part of Org's |
| 71 | core and many core functions rely on this package. | 71 | core and many core functions rely on this package. |
| 72 | 72 | ||
| 73 | Two functions might be particularily handy for users: | 73 | Two functions might be particularly handy for users: |
| 74 | =org-element-at-point= and =org-element-context=. | 74 | =org-element-at-point= and =org-element-context=. |
| 75 | 75 | ||
| 76 | See the docstrings for more details. | 76 | See the docstrings for more details. |
| @@ -539,7 +539,7 @@ supported. | |||
| 539 | **** =:results org= now put results in a =#+BEGIN_SRC org= block | 539 | **** =:results org= now put results in a =#+BEGIN_SRC org= block |
| 540 | 540 | ||
| 541 | =:results org= used to put results in a =#+BEGIN_ORG= block but it now puts | 541 | =:results org= used to put results in a =#+BEGIN_ORG= block but it now puts |
| 542 | results in a =#+BEGIN_SRC org= block, wich comma-escaped lines. | 542 | results in a =#+BEGIN_SRC org= block, with comma-escaped lines. |
| 543 | 543 | ||
| 544 | =#+BEGIN_ORG= blocks are obsolete. | 544 | =#+BEGIN_ORG= blocks are obsolete. |
| 545 | 545 | ||
| @@ -552,7 +552,7 @@ It used to exports the results of the code. | |||
| 552 | **** New menu entry for [[doc::org-refile][org-refile]] | 552 | **** New menu entry for [[doc::org-refile][org-refile]] |
| 553 | **** Allow capturing to encrypted entries | 553 | **** Allow capturing to encrypted entries |
| 554 | 554 | ||
| 555 | If you capture to an encrypted entry, it will be decrpyted before | 555 | If you capture to an encrypted entry, it will be decrypted before |
| 556 | inserting the template then re-encrypted after finalizing the capture. | 556 | inserting the template then re-encrypted after finalizing the capture. |
| 557 | 557 | ||
| 558 | **** Inactive timestamps are now handled in tables | 558 | **** Inactive timestamps are now handled in tables |
| @@ -932,7 +932,7 @@ that Calc formulas can operate on them. | |||
| 932 | 932 | ||
| 933 | **** org-gnus.el now allows link creation from messages | 933 | **** org-gnus.el now allows link creation from messages |
| 934 | 934 | ||
| 935 | You can now create links from messages. This is particularily | 935 | You can now create links from messages. This is particularly |
| 936 | useful when the user wants to stored messages that he sends, for | 936 | useful when the user wants to stored messages that he sends, for |
| 937 | later check. Thanks to Ulf Stegemann for the patch. | 937 | later check. Thanks to Ulf Stegemann for the patch. |
| 938 | 938 | ||
| @@ -1115,7 +1115,7 @@ that Calc formulas can operate on them. | |||
| 1115 | 1115 | ||
| 1116 | *** Completion | 1116 | *** Completion |
| 1117 | 1117 | ||
| 1118 | **** In-buffer completion is now done using John Wiegleys pcomplete.el | 1118 | **** In-buffer completion is now done using John Wiegley's pcomplete.el |
| 1119 | 1119 | ||
| 1120 | Thanks to John Wiegley for much of this code. | 1120 | Thanks to John Wiegley for much of this code. |
| 1121 | 1121 | ||
diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 8311a2893c8..65558402bf3 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h | |||
| @@ -458,7 +458,7 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " | |||
| 458 | /* Return the pathname of the pseudo-terminal slave associated with | 458 | /* Return the pathname of the pseudo-terminal slave associated with |
| 459 | the master FD is open on, or NULL on errors. */ | 459 | the master FD is open on, or NULL on errors. */ |
| 460 | # if @REPLACE_PTSNAME@ | 460 | # if @REPLACE_PTSNAME@ |
| 461 | # if !(defined __cplusplus && defined GNULIB_NAMESPCE) | 461 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |
| 462 | # undef ptsname | 462 | # undef ptsname |
| 463 | # define ptsname rpl_ptsname | 463 | # define ptsname rpl_ptsname |
| 464 | # endif | 464 | # endif |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f6138eaa15b..eaef867e9e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -8347,7 +8347,8 @@ | |||
| 8347 | 8347 | ||
| 8348 | 2012-03-18 Leo Liu <sdl.web@gmail.com> | 8348 | 2012-03-18 Leo Liu <sdl.web@gmail.com> |
| 8349 | 8349 | ||
| 8350 | * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with prefix. | 8350 | * net/rcirc.el (rcirc-cmd-quit): Allow quitting all servers with |
| 8351 | prefix. | ||
| 8351 | 8352 | ||
| 8352 | 2012-03-17 Eli Zaretskii <eliz@gnu.org> | 8353 | 2012-03-17 Eli Zaretskii <eliz@gnu.org> |
| 8353 | 8354 | ||
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index d94d72d0f3c..c9085827f7b 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 | |||
| @@ -5492,7 +5492,7 @@ | |||
| 5492 | 5492 | ||
| 5493 | 2003-02-14 Dave Love <fx@gnu.org> | 5493 | 2003-02-14 Dave Love <fx@gnu.org> |
| 5494 | 5494 | ||
| 5495 | * international/code-pages.el: Undo `Trailing whitepace deleted.' | 5495 | * international/code-pages.el: Undo `Trailing whitespace deleted.' |
| 5496 | damage. | 5496 | damage. |
| 5497 | (cp1125, mik): Nullify mime-charset. | 5497 | (cp1125, mik): Nullify mime-charset. |
| 5498 | 5498 | ||
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index ce3536d53ee..22fe362d5d9 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el | |||
| @@ -1358,13 +1358,13 @@ Return the first non-nil value returned by PROC." | |||
| 1358 | (defmethod ede-system-include-path ((this ede-project)) | 1358 | (defmethod ede-system-include-path ((this ede-project)) |
| 1359 | "Get the system include path used by project THIS." | 1359 | "Get the system include path used by project THIS." |
| 1360 | nil) | 1360 | nil) |
| 1361 | 1361 | ||
| 1362 | (defmethod ede-system-include-path ((this ede-target)) | 1362 | (defmethod ede-system-include-path ((this ede-target)) |
| 1363 | "Get the system include path used by project THIS." | 1363 | "Get the system include path used by project THIS." |
| 1364 | nil) | 1364 | nil) |
| 1365 | 1365 | ||
| 1366 | (defmethod ede-source-paths ((this ede-project) mode) | 1366 | (defmethod ede-source-paths ((this ede-project) mode) |
| 1367 | "Get the base to all source trees in the current projet for MODE. | 1367 | "Get the base to all source trees in the current project for MODE. |
| 1368 | For example, <root>/src for sources of c/c++, Java, etc, | 1368 | For example, <root>/src for sources of c/c++, Java, etc, |
| 1369 | and <root>/doc for doc sources." | 1369 | and <root>/doc for doc sources." |
| 1370 | nil) | 1370 | nil) |
diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index f6446db9108..152f8130ad7 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el | |||
| @@ -68,7 +68,7 @@ into memory.") | |||
| 68 | 68 | ||
| 69 | ;; Add new types of dirmatches here. | 69 | ;; Add new types of dirmatches here. |
| 70 | 70 | ||
| 71 | ;; Error for wierd stuff | 71 | ;; Error for weird stuff |
| 72 | (t (error "Unknown dirmatch type."))))) | 72 | (t (error "Unknown dirmatch type."))))) |
| 73 | 73 | ||
| 74 | 74 | ||
| @@ -285,7 +285,7 @@ the current buffer." | |||
| 285 | ;; If this file DOES NOT match dirmatch, we set the callfcn | 285 | ;; If this file DOES NOT match dirmatch, we set the callfcn |
| 286 | ;; to nil, meaning don't load the ede support file for this | 286 | ;; to nil, meaning don't load the ede support file for this |
| 287 | ;; type of project. If it does match, we will load the file | 287 | ;; type of project. If it does match, we will load the file |
| 288 | ;; and use a more accurate programatic match from there. | 288 | ;; and use a more accurate programmatic match from there. |
| 289 | (unless (ede-project-dirmatch-p file dirmatch) | 289 | (unless (ede-project-dirmatch-p file dirmatch) |
| 290 | (setq callfcn nil)))) | 290 | (setq callfcn nil)))) |
| 291 | ;; Call into the project support file for a match. | 291 | ;; Call into the project support file for a match. |
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el index 8144b135ac5..ebfb4154d81 100644 --- a/lisp/cedet/ede/autoconf-edit.el +++ b/lisp/cedet/ede/autoconf-edit.el | |||
| @@ -165,7 +165,7 @@ items such as CHECK_HEADERS." | |||
| 165 | (setq param (substring param (match-end 0)))) | 165 | (setq param (substring param (match-end 0)))) |
| 166 | (when (string-match "\\s-*\\]?\\s-*\\'" param) | 166 | (when (string-match "\\s-*\\]?\\s-*\\'" param) |
| 167 | (setq param (substring param 0 (match-beginning 0)))) | 167 | (setq param (substring param 0 (match-beginning 0)))) |
| 168 | ;; Look for occurances of backslash newline | 168 | ;; Look for occurrences of backslash newline |
| 169 | (while (string-match "\\s-*\\\\\\s-*\n\\s-*" param) | 169 | (while (string-match "\\s-*\\\\\\s-*\n\\s-*" param) |
| 170 | (setq param (replace-match " " t t param))) | 170 | (setq param (replace-match " " t t param))) |
| 171 | param) | 171 | param) |
diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 6a13a12e8e1..6b0f007916b 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el | |||
| @@ -348,7 +348,7 @@ Optional argument RESERVED is saved for later use." | |||
| 348 | 348 | ||
| 349 | ;;;###autoload | 349 | ;;;###autoload |
| 350 | (defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver) | 350 | (defun inversion-require-emacs (emacs-ver xemacs-ver sxemacs-ver) |
| 351 | "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACE-ver. | 351 | "Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver. |
| 352 | Only checks one based on which kind of Emacs is being run." | 352 | Only checks one based on which kind of Emacs is being run." |
| 353 | (let ((err (inversion-test 'emacs | 353 | (let ((err (inversion-test 'emacs |
| 354 | (cond ((featurep 'sxemacs) | 354 | (cond ((featurep 'sxemacs) |
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 871bcdd6176..02ad6e05d1a 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el | |||
| @@ -390,7 +390,7 @@ Pulls out the symbol list, and call `semantic-c-convert-spp-value-to-hideif-valu | |||
| 390 | ;; can then interpret. | 390 | ;; can then interpret. |
| 391 | (let ((stream (semantic-lex-spp-symbol-stream spp-symbol))) | 391 | (let ((stream (semantic-lex-spp-symbol-stream spp-symbol))) |
| 392 | (cond | 392 | (cond |
| 393 | ;; Empyt string means defined, so t. | 393 | ;; Empty string means defined, so t. |
| 394 | ((null stream) t) | 394 | ((null stream) t) |
| 395 | ;; A list means a parsed macro stream. | 395 | ;; A list means a parsed macro stream. |
| 396 | ((listp stream) | 396 | ((listp stream) |
| @@ -515,7 +515,7 @@ code to parse." | |||
| 515 | ;; should be skipped. | 515 | ;; should be skipped. |
| 516 | (semantic-c-skip-conditional-section) | 516 | (semantic-c-skip-conditional-section) |
| 517 | (setq semantic-lex-end-point (point)) | 517 | (setq semantic-lex-end-point (point)) |
| 518 | 518 | ||
| 519 | ;; @TODO -somewhere around here, we also need to skip | 519 | ;; @TODO -somewhere around here, we also need to skip |
| 520 | ;; other sections of the conditional. | 520 | ;; other sections of the conditional. |
| 521 | 521 | ||
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index f666491d667..61760dd3fe8 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el | |||
| @@ -1555,7 +1555,7 @@ number of completions initially. Pressing TAB will show the | |||
| 1555 | extended set. | 1555 | extended set. |
| 1556 | 1556 | ||
| 1557 | Quiet: Only show completions when we have narrowed all | 1557 | Quiet: Only show completions when we have narrowed all |
| 1558 | posibilities down to a maximum of | 1558 | possibilities down to a maximum of |
| 1559 | `semantic-displayor-tooltip-initial-max-tags' tags. Pressing TAB | 1559 | `semantic-displayor-tooltip-initial-max-tags' tags. Pressing TAB |
| 1560 | multiple times will also show completions. | 1560 | multiple times will also show completions. |
| 1561 | 1561 | ||
| @@ -2239,4 +2239,3 @@ will perform the completion." | |||
| 2239 | ;; End: | 2239 | ;; End: |
| 2240 | 2240 | ||
| 2241 | ;;; semantic/complete.el ends here | 2241 | ;;; semantic/complete.el ends here |
| 2242 | |||
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index 0d144483cb9..a7bb130810e 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el | |||
| @@ -48,7 +48,7 @@ in a GNU Global supported hierarchy. | |||
| 48 | Two sanity checks are performed to assure (a) that GNU global program exists | 48 | Two sanity checks are performed to assure (a) that GNU global program exists |
| 49 | and (b) that the GNU global program version is compatibility with the database | 49 | and (b) that the GNU global program version is compatibility with the database |
| 50 | version. If optional NOERROR is nil, then an error may be signalled on version | 50 | version. If optional NOERROR is nil, then an error may be signalled on version |
| 51 | mismatch. If NOERROR is not nil, then no error will be signlled. Instead | 51 | mismatch. If NOERROR is not nil, then no error will be signaled. Instead |
| 52 | return value will indicate success or failure with non-nil or nil respective | 52 | return value will indicate success or failure with non-nil or nil respective |
| 53 | values." | 53 | values." |
| 54 | (interactive | 54 | (interactive |
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 94999a2797b..0da98a6d357 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el | |||
| @@ -584,7 +584,7 @@ If there isn't one, create it. | |||
| 584 | (dolist (P path) | 584 | (dolist (P path) |
| 585 | (condition-case nil | 585 | (condition-case nil |
| 586 | (oset P pointmax nil) | 586 | (oset P pointmax nil) |
| 587 | ;; Pointmax may not exist for all tables disovered in the | 587 | ;; Pointmax may not exist for all tables discovered in the |
| 588 | ;; path. | 588 | ;; path. |
| 589 | (error nil)) | 589 | (error nil)) |
| 590 | (semantic-reset (semanticdb-get-typecache P))))) | 590 | (semantic-reset (semanticdb-get-typecache P))))) |
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index ede5c890163..0c2c5e3ce37 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el | |||
| @@ -589,7 +589,7 @@ This means that Semantic cannot find a file associated with this tag | |||
| 589 | on disk, but a database table of tags has been associated with it. | 589 | on disk, but a database table of tags has been associated with it. |
| 590 | 590 | ||
| 591 | This means that the include will still be used to find tags for | 591 | This means that the include will still be used to find tags for |
| 592 | searches, but you connot visit this include.\n\n") | 592 | searches, but you cannot visit this include.\n\n") |
| 593 | (princ "This Header is now represented by the following database table:\n\n ") | 593 | (princ "This Header is now represented by the following database table:\n\n ") |
| 594 | (princ (object-print table)) | 594 | (princ (object-print table)) |
| 595 | ))) | 595 | ))) |
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index c14ffb77169..5a12047eb76 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | c))) | 85 | c))) |
| 86 | event)) | 86 | event)) |
| 87 | (defun semantic-popup-menu (menu) | 87 | (defun semantic-popup-menu (menu) |
| 88 | "Blockinig version of `popup-menu'" | 88 | "Blocking version of `popup-menu'" |
| 89 | (popup-menu menu) | 89 | (popup-menu menu) |
| 90 | ;; Wait... | 90 | ;; Wait... |
| 91 | (while (popup-up-p) (dispatch-event (next-event)))) | 91 | (while (popup-up-p) (dispatch-event (next-event)))) |
| @@ -139,7 +139,7 @@ | |||
| 139 | 'run-mode-hooks | 139 | 'run-mode-hooks |
| 140 | 'run-hooks)) | 140 | 'run-hooks)) |
| 141 | 141 | ||
| 142 | ;; Fancy compat useage now handled in cedet-compat | 142 | ;; Fancy compat usage now handled in cedet-compat |
| 143 | (defalias 'semantic-subst-char-in-string 'subst-char-in-string) | 143 | (defalias 'semantic-subst-char-in-string 'subst-char-in-string) |
| 144 | ) | 144 | ) |
| 145 | 145 | ||
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 5fe900452a0..406f2900563 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el | |||
| @@ -646,7 +646,7 @@ be merged recursively." | |||
| 646 | ;; #define FOO(a) foo##a##bar | 646 | ;; #define FOO(a) foo##a##bar |
| 647 | (semantic-lex-spp-symbol-merge (cadr tok))) | 647 | (semantic-lex-spp-symbol-merge (cadr tok))) |
| 648 | (t | 648 | (t |
| 649 | (message "Invalid merge macro ecountered; \ | 649 | (message "Invalid merge macro encountered; \ |
| 650 | will return empty string instead.") | 650 | will return empty string instead.") |
| 651 | ""))) | 651 | ""))) |
| 652 | txt | 652 | txt |
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el index c294fd1727e..c6aa48bfbc3 100644 --- a/lisp/cedet/semantic/symref/filter.el +++ b/lisp/cedet/semantic/symref/filter.el | |||
| @@ -101,7 +101,7 @@ tag that contains point, and return that." | |||
| 101 | (semantic-tag-start tag) | 101 | (semantic-tag-start tag) |
| 102 | (semantic-tag-end tag)) | 102 | (semantic-tag-end tag)) |
| 103 | (when (called-interactively-p 'interactive) | 103 | (when (called-interactively-p 'interactive) |
| 104 | (message "Found %d occurances of %s in %.2f seconds" | 104 | (message "Found %d occurrences of %s in %.2f seconds" |
| 105 | Lcount (semantic-tag-name target) | 105 | Lcount (semantic-tag-name target) |
| 106 | (semantic-elapsed-time start (current-time)))) | 106 | (semantic-elapsed-time start (current-time)))) |
| 107 | Lcount))) | 107 | Lcount))) |
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index d6d2c203aa8..094ea554287 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el | |||
| @@ -66,7 +66,7 @@ have values, they must still match." | |||
| 66 | 66 | ||
| 67 | (define-overloadable-function semantic--tag-similar-types-p (tag1 tag2) | 67 | (define-overloadable-function semantic--tag-similar-types-p (tag1 tag2) |
| 68 | "Compare the types of TAG1 and TAG2. | 68 | "Compare the types of TAG1 and TAG2. |
| 69 | This functions can be overriden, for example to compare a fully | 69 | This function can be overridden, for example to compare a fully |
| 70 | qualified with an unqualified type." | 70 | qualified with an unqualified type." |
| 71 | (cond | 71 | (cond |
| 72 | ((and (null (semantic-tag-type tag1)) | 72 | ((and (null (semantic-tag-type tag1)) |
| @@ -80,7 +80,7 @@ qualified with an unqualified type." | |||
| 80 | 80 | ||
| 81 | (defun semantic--tag-similar-types-p-default (tag1 tag2) | 81 | (defun semantic--tag-similar-types-p-default (tag1 tag2) |
| 82 | "Compare the types of TAG1 and TAG2. | 82 | "Compare the types of TAG1 and TAG2. |
| 83 | This functions can be overriden, for example to compare a fully | 83 | This function can be overridden, for example to compare a fully |
| 84 | qualified with an unqualified type." | 84 | qualified with an unqualified type." |
| 85 | (semantic-tag-of-type-p tag1 (semantic-tag-type tag2))) | 85 | (semantic-tag-of-type-p tag1 (semantic-tag-type tag2))) |
| 86 | 86 | ||
| @@ -97,7 +97,7 @@ Modes that override this function can call `semantic--tag-attribute-similar-p-de | |||
| 97 | to do the default equality tests if ATTR is not special for that mode.") | 97 | to do the default equality tests if ATTR is not special for that mode.") |
| 98 | 98 | ||
| 99 | (defun semantic--tag-attribute-similar-p-default (attr value1 value2 ignorable-attributes) | 99 | (defun semantic--tag-attribute-similar-p-default (attr value1 value2 ignorable-attributes) |
| 100 | "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarness." | 100 | "For ATTR, VALUE1, VALUE2 and IGNORABLE-ATTRIBUTES, test for similarity." |
| 101 | (cond | 101 | (cond |
| 102 | ;; Tag sublists require special testing. | 102 | ;; Tag sublists require special testing. |
| 103 | ((and (listp value1) (semantic-tag-p (car value1)) | 103 | ((and (listp value1) (semantic-tag-p (car value1)) |
| @@ -131,7 +131,7 @@ Similar tags that have sub-tags such as arg lists or type members, | |||
| 131 | are similar w/out checking the sub-list of tags. | 131 | are similar w/out checking the sub-list of tags. |
| 132 | Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity. | 132 | Optional argument IGNORABLE-ATTRIBUTES are attributes to ignore while comparing similarity. |
| 133 | By default, `semantic-tag-similar-ignorable-attributes' is referenced for | 133 | By default, `semantic-tag-similar-ignorable-attributes' is referenced for |
| 134 | attributes, and IGNOREABLE-ATTRIBUTES will augment this list. | 134 | attributes, and IGNORABLE-ATTRIBUTES will augment this list. |
| 135 | 135 | ||
| 136 | Note that even though :name is not an attribute, it can be used to | 136 | Note that even though :name is not an attribute, it can be used to |
| 137 | to indicate lax comparison of names via `semantic--tag-similar-names-p'") | 137 | to indicate lax comparison of names via `semantic--tag-similar-names-p'") |
| @@ -207,7 +207,7 @@ Return the name of the first tag of class `package' in STREAM." | |||
| 207 | 207 | ||
| 208 | (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) | 208 | (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) |
| 209 | "Return the fully qualified name of TAG in the package hierarchy. | 209 | "Return the fully qualified name of TAG in the package hierarchy. |
| 210 | STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', | 210 | STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream', |
| 211 | but must be a toplevel semantic tag stream that contains TAG. | 211 | but must be a toplevel semantic tag stream that contains TAG. |
| 212 | A Package Hierarchy is defined in UML by the way classes and methods | 212 | A Package Hierarchy is defined in UML by the way classes and methods |
| 213 | are organized on disk. Some languages use this concept such that a | 213 | are organized on disk. Some languages use this concept such that a |
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el index 08fe467b367..38166871cea 100644 --- a/lisp/cedet/semantic/tag.el +++ b/lisp/cedet/semantic/tag.el | |||
| @@ -554,7 +554,7 @@ You can identify a faux tag with `semantic-tag-faux-p'" | |||
| 554 | "Set TAG name to NAME." | 554 | "Set TAG name to NAME." |
| 555 | (setcar tag name)) | 555 | (setcar tag name)) |
| 556 | 556 | ||
| 557 | ;;; TAG Proxys | 557 | ;;; TAG Proxies |
| 558 | ;; | 558 | ;; |
| 559 | ;; A new kind of tag is a TAG PROXY. These are tags that have some | 559 | ;; A new kind of tag is a TAG PROXY. These are tags that have some |
| 560 | ;; minimal number of features set, such as name and class, but have a | 560 | ;; minimal number of features set, such as name and class, but have a |
| @@ -570,7 +570,7 @@ two arguments, DATA and TAG. TAG is a proxy tag that needs | |||
| 570 | to be resolved, and DATA is the DATA passed into this function. | 570 | to be resolved, and DATA is the DATA passed into this function. |
| 571 | DATA is data to help resolve the proxy. DATA can be an EIEIO object, | 571 | DATA is data to help resolve the proxy. DATA can be an EIEIO object, |
| 572 | such that FUNCTION is a method. | 572 | such that FUNCTION is a method. |
| 573 | FUNCTION should return a list of tags, preferrably one tag." | 573 | FUNCTION should return a list of tags, preferably one tag." |
| 574 | (let ((sym (make-symbol ":tag-proxy"))) | 574 | (let ((sym (make-symbol ":tag-proxy"))) |
| 575 | (put sym 'proxy-function function) | 575 | (put sym 'proxy-function function) |
| 576 | (put sym 'proxy-data data) | 576 | (put sym 'proxy-data data) |
diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 6677e2c3abb..69fe762887f 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el | |||
| @@ -228,8 +228,8 @@ a file. Optional argument NAME specifies a default file name." | |||
| 228 | "Read a persistent object from FILENAME, and return it. | 228 | "Read a persistent object from FILENAME, and return it. |
| 229 | Signal an error if the object in FILENAME is not a constructor | 229 | Signal an error if the object in FILENAME is not a constructor |
| 230 | for CLASS. Optional ALLOW-SUBCLASS says that it is ok for | 230 | for CLASS. Optional ALLOW-SUBCLASS says that it is ok for |
| 231 | `eieio-peristent-read' to load in subclasses of class instead of | 231 | `eieio-persistent-read' to load in subclasses of class instead of |
| 232 | being pendantic." | 232 | being pedantic." |
| 233 | (unless class | 233 | (unless class |
| 234 | (message "Unsafe call to `eieio-persistent-read'.")) | 234 | (message "Unsafe call to `eieio-persistent-read'.")) |
| 235 | (when (and class (not (class-p class))) | 235 | (when (and class (not (class-p class))) |
| @@ -301,7 +301,7 @@ identified, and needing more object creation." | |||
| 301 | "Validate that in CLASS, the SLOT with PROPOSED-VALUE is good, then fix. | 301 | "Validate that in CLASS, the SLOT with PROPOSED-VALUE is good, then fix. |
| 302 | A limited number of functions, such as quote, list, and valid object | 302 | A limited number of functions, such as quote, list, and valid object |
| 303 | constructor functions are considered valid. | 303 | constructor functions are considered valid. |
| 304 | Secondarilly, any text properties will be stripped from strings." | 304 | Second, any text properties will be stripped from strings." |
| 305 | (cond ((consp proposed-value) | 305 | (cond ((consp proposed-value) |
| 306 | ;; Lists with something in them need special treatment. | 306 | ;; Lists with something in them need special treatment. |
| 307 | (let ((slot-idx (eieio-slot-name-index class nil slot)) | 307 | (let ((slot-idx (eieio-slot-name-index class nil slot)) |
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el index 494d8a87e0e..08b8ced9860 100644 --- a/lisp/emacs-lisp/timer.el +++ b/lisp/emacs-lisp/timer.el | |||
| @@ -204,7 +204,7 @@ timers). If nil, allocate a new cell." | |||
| 204 | "Insert TIMER into `timer-idle-list'. | 204 | "Insert TIMER into `timer-idle-list'. |
| 205 | This arranges to activate TIMER whenever Emacs is next idle. | 205 | This arranges to activate TIMER whenever Emacs is next idle. |
| 206 | If optional argument DONT-WAIT is non-nil, set TIMER to activate | 206 | If optional argument DONT-WAIT is non-nil, set TIMER to activate |
| 207 | immediately \(see beloe\), or at the right time, if Emacs is | 207 | immediately \(see below\), or at the right time, if Emacs is |
| 208 | already idle. | 208 | already idle. |
| 209 | 209 | ||
| 210 | REUSE-CELL, if non-nil, is a cons cell to reuse when inserting | 210 | REUSE-CELL, if non-nil, is a cons cell to reuse when inserting |
diff --git a/lisp/ido.el b/lisp/ido.el index 94818fe57b0..ffa2604d4fb 100644 --- a/lisp/ido.el +++ b/lisp/ido.el | |||
| @@ -496,7 +496,7 @@ as first char even if `ido-enable-prefix' is nil." | |||
| 496 | ;; See http://debbugs.gnu.org/2042 for more info. | 496 | ;; See http://debbugs.gnu.org/2042 for more info. |
| 497 | (defcustom ido-buffer-disable-smart-matches t | 497 | (defcustom ido-buffer-disable-smart-matches t |
| 498 | "Non-nil means not to re-order matches for buffer switching. | 498 | "Non-nil means not to re-order matches for buffer switching. |
| 499 | By default, ido aranges matches in the following order: | 499 | By default, ido arranges matches in the following order: |
| 500 | 500 | ||
| 501 | full-matches > suffix matches > prefix matches > remaining matches | 501 | full-matches > suffix matches > prefix matches > remaining matches |
| 502 | 502 | ||
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 066ebf3e6e0..ef40c9316cf 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -2079,13 +2079,7 @@ | |||
| 2079 | 2079 | ||
| 2080 | * org-agenda.el (org-agenda-list): Ensures that the list returned | 2080 | * org-agenda.el (org-agenda-list): Ensures that the list returned |
| 2081 | by `org-agenda-add-time-grid-maybe' is appended to ̀rtnall' before | 2081 | by `org-agenda-add-time-grid-maybe' is appended to ̀rtnall' before |
| 2082 | checking if the latter is emtpy. | 2082 | checking if the latter is empty. |
| 2083 | |||
| 2084 | 2012-09-30 Christophe Junke <junke.christophe@gmail.com> (tiny change) | ||
| 2085 | |||
| 2086 | * org-agenda.el (org-agenda-list): Ensure that the list returned | ||
| 2087 | by `org-agenda-add-time-grid-maybe' is appended to `rtnall' before | ||
| 2088 | checking if the latter is emtpy. | ||
| 2089 | 2083 | ||
| 2090 | 2012-09-30 Christophe Rhodes <csr21@cantab.net> (tiny change) | 2084 | 2012-09-30 Christophe Rhodes <csr21@cantab.net> (tiny change) |
| 2091 | 2085 | ||
| @@ -2691,7 +2685,7 @@ | |||
| 2691 | * org-element.el (org-element-paragraph-parser): Fix parsing of | 2685 | * org-element.el (org-element-paragraph-parser): Fix parsing of |
| 2692 | paragraph at the beginning of an item. | 2686 | paragraph at the beginning of an item. |
| 2693 | 2687 | ||
| 2694 | * org.el (org-mode): Set back comment-start-skip so comment-dwin | 2688 | * org.el (org-mode): Set back comment-start-skip so comment-dwim |
| 2695 | can tell a keyword from a comment. | 2689 | can tell a keyword from a comment. |
| 2696 | 2690 | ||
| 2697 | * org.el (org-set-autofill-regexps): Install new comment line | 2691 | * org.el (org-set-autofill-regexps): Install new comment line |
| @@ -2959,7 +2953,7 @@ | |||
| 2959 | 2953 | ||
| 2960 | * org-capture.el (org-capture-fill-template): Expand %<num> escape | 2954 | * org-capture.el (org-capture-fill-template): Expand %<num> escape |
| 2961 | sequences into text entered for <num>'th %^{PROMPT} escape. | 2955 | sequences into text entered for <num>'th %^{PROMPT} escape. |
| 2962 | 2956 | ||
| 2963 | * org-capture.el (org-capture-fill-template): Fixed regexp for | 2957 | * org-capture.el (org-capture-fill-template): Fixed regexp for |
| 2964 | %<n> expandos to match any positive integer. | 2958 | %<n> expandos to match any positive integer. |
| 2965 | (org-capture-templates): Updated docstring accordingly. | 2959 | (org-capture-templates): Updated docstring accordingly. |
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 97241b6ac65..32fecde2af0 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el | |||
| @@ -823,7 +823,7 @@ because you will take care of it on the day when scheduled." | |||
| 823 | :group 'org-agenda-daily/weekly | 823 | :group 'org-agenda-daily/weekly |
| 824 | :version "24.1" | 824 | :version "24.1" |
| 825 | :type '(choice | 825 | :type '(choice |
| 826 | (const :tag "Alwas show prewarning" nil) | 826 | (const :tag "Always show prewarning" nil) |
| 827 | (const :tag "Remove prewarning if entry is scheduled" t) | 827 | (const :tag "Remove prewarning if entry is scheduled" t) |
| 828 | (integer :tag "Restart prewarning N days before deadline"))) | 828 | (integer :tag "Restart prewarning N days before deadline"))) |
| 829 | 829 | ||
| @@ -2837,7 +2837,7 @@ L Timeline for current buffer # List stuck projects (!=configure) | |||
| 2837 | (widen) | 2837 | (widen) |
| 2838 | (let ((inhibit-read-only t)) | 2838 | (let ((inhibit-read-only t)) |
| 2839 | (add-text-properties (point-min) (point-max) | 2839 | (add-text-properties (point-min) (point-max) |
| 2840 | `(org-serie t org-serie-redo-cmd ,redo))) | 2840 | `(org-series t org-series-redo-cmd ,redo))) |
| 2841 | (setq org-agenda-redo-command redo) | 2841 | (setq org-agenda-redo-command redo) |
| 2842 | (goto-char (point-min))) | 2842 | (goto-char (point-min))) |
| 2843 | (org-agenda-fit-window-to-buffer) | 2843 | (org-agenda-fit-window-to-buffer) |
| @@ -4019,7 +4019,7 @@ given in `org-agenda-start-on-weekday'." | |||
| 4019 | `(org-agenda-type agenda | 4019 | `(org-agenda-type agenda |
| 4020 | org-last-args (,arg ,start-day ,span) | 4020 | org-last-args (,arg ,start-day ,span) |
| 4021 | org-redo-cmd ,org-agenda-redo-command | 4021 | org-redo-cmd ,org-agenda-redo-command |
| 4022 | org-serie-cmd ,org-cmd)) | 4022 | org-series-cmd ,org-cmd)) |
| 4023 | (if (eq org-agenda-show-log-scoped 'clockcheck) | 4023 | (if (eq org-agenda-show-log-scoped 'clockcheck) |
| 4024 | (org-agenda-show-clocking-issues)) | 4024 | (org-agenda-show-clocking-issues)) |
| 4025 | (org-agenda-finalize) | 4025 | (org-agenda-finalize) |
| @@ -4324,7 +4324,7 @@ in `org-agenda-text-search-extra-files'." | |||
| 4324 | `(org-agenda-type search | 4324 | `(org-agenda-type search |
| 4325 | org-last-args (,todo-only ,string ,edit-at) | 4325 | org-last-args (,todo-only ,string ,edit-at) |
| 4326 | org-redo-cmd ,org-agenda-redo-command | 4326 | org-redo-cmd ,org-agenda-redo-command |
| 4327 | org-serie-cmd ,org-cmd)) | 4327 | org-series-cmd ,org-cmd)) |
| 4328 | (org-agenda-finalize) | 4328 | (org-agenda-finalize) |
| 4329 | (setq buffer-read-only t)))) | 4329 | (setq buffer-read-only t)))) |
| 4330 | 4330 | ||
| @@ -4414,7 +4414,7 @@ for a keyword. A numeric prefix directly selects the Nth keyword in | |||
| 4414 | `(org-agenda-type todo | 4414 | `(org-agenda-type todo |
| 4415 | org-last-args ,arg | 4415 | org-last-args ,arg |
| 4416 | org-redo-cmd ,org-agenda-redo-command | 4416 | org-redo-cmd ,org-agenda-redo-command |
| 4417 | org-serie-cmd ,org-cmd)) | 4417 | org-series-cmd ,org-cmd)) |
| 4418 | (org-agenda-finalize) | 4418 | (org-agenda-finalize) |
| 4419 | (setq buffer-read-only t)))) | 4419 | (setq buffer-read-only t)))) |
| 4420 | 4420 | ||
| @@ -4499,7 +4499,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries." | |||
| 4499 | `(org-agenda-type tags | 4499 | `(org-agenda-type tags |
| 4500 | org-last-args (,todo-only ,match) | 4500 | org-last-args (,todo-only ,match) |
| 4501 | org-redo-cmd ,org-agenda-redo-command | 4501 | org-redo-cmd ,org-agenda-redo-command |
| 4502 | org-serie-cmd ,org-cmd)) | 4502 | org-series-cmd ,org-cmd)) |
| 4503 | (org-agenda-finalize) | 4503 | (org-agenda-finalize) |
| 4504 | (setq buffer-read-only t)))) | 4504 | (setq buffer-read-only t)))) |
| 4505 | 4505 | ||
| @@ -6583,7 +6583,7 @@ Org-mode buffers visited directly by the user will not be touched." | |||
| 6583 | (org-agenda-Quit)) | 6583 | (org-agenda-Quit)) |
| 6584 | 6584 | ||
| 6585 | (defun org-agenda-kill-all-agenda-buffers () | 6585 | (defun org-agenda-kill-all-agenda-buffers () |
| 6586 | "Kill all buffers in `org-agena-mode'. | 6586 | "Kill all buffers in `org-agenda-mode'. |
| 6587 | This is used when toggling sticky agendas. You can also explicitly invoke it | 6587 | This is used when toggling sticky agendas. You can also explicitly invoke it |
| 6588 | with `C-c a C-k'." | 6588 | with `C-c a C-k'." |
| 6589 | (interactive) | 6589 | (interactive) |
| @@ -6623,20 +6623,20 @@ in the agenda." | |||
| 6623 | (lprops (get 'org-agenda-redo-command 'org-lprops)) | 6623 | (lprops (get 'org-agenda-redo-command 'org-lprops)) |
| 6624 | (redo-cmd (get-text-property p 'org-redo-cmd)) | 6624 | (redo-cmd (get-text-property p 'org-redo-cmd)) |
| 6625 | (last-args (get-text-property p 'org-last-args)) | 6625 | (last-args (get-text-property p 'org-last-args)) |
| 6626 | (org-agenda-overriding-cmd (get-text-property p 'org-serie-cmd)) | 6626 | (org-agenda-overriding-cmd (get-text-property p 'org-series-cmd)) |
| 6627 | (org-agenda-overriding-cmd-arguments | 6627 | (org-agenda-overriding-cmd-arguments |
| 6628 | (unless (eq all t) | 6628 | (unless (eq all t) |
| 6629 | (cond ((listp last-args) | 6629 | (cond ((listp last-args) |
| 6630 | (cons (or cpa (car last-args)) (cdr last-args))) | 6630 | (cons (or cpa (car last-args)) (cdr last-args))) |
| 6631 | ((stringp last-args) | 6631 | ((stringp last-args) |
| 6632 | last-args)))) | 6632 | last-args)))) |
| 6633 | (serie-redo-cmd (get-text-property p 'org-serie-redo-cmd))) | 6633 | (series-redo-cmd (get-text-property p 'org-series-redo-cmd))) |
| 6634 | (put 'org-agenda-tag-filter :preset-filter nil) | 6634 | (put 'org-agenda-tag-filter :preset-filter nil) |
| 6635 | (put 'org-agenda-category-filter :preset-filter nil) | 6635 | (put 'org-agenda-category-filter :preset-filter nil) |
| 6636 | (and cols (org-columns-quit)) | 6636 | (and cols (org-columns-quit)) |
| 6637 | (message "Rebuilding agenda buffer...") | 6637 | (message "Rebuilding agenda buffer...") |
| 6638 | (if serie-redo-cmd | 6638 | (if series-redo-cmd |
| 6639 | (eval serie-redo-cmd) | 6639 | (eval series-redo-cmd) |
| 6640 | (org-let lprops '(eval redo-cmd))) | 6640 | (org-let lprops '(eval redo-cmd))) |
| 6641 | (setq org-agenda-undo-list nil | 6641 | (setq org-agenda-undo-list nil |
| 6642 | org-agenda-pending-undo-list nil) | 6642 | org-agenda-pending-undo-list nil) |
| @@ -7035,7 +7035,7 @@ Negative selection means regexp must not match for selection of an entry." | |||
| 7035 | (or (and cnt (text-property-any (point-min) (point-max) 'org-day-cnt cnt)) | 7035 | (or (and cnt (text-property-any (point-min) (point-max) 'org-day-cnt cnt)) |
| 7036 | (text-property-any (point-min) (point-max) 'org-today t) | 7036 | (text-property-any (point-min) (point-max) 'org-today t) |
| 7037 | (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda) | 7037 | (text-property-any (point-min) (point-max) 'org-agenda-type 'agenda) |
| 7038 | (and (get-text-property (min (1- (point-max)) (point)) 'org-serie) | 7038 | (and (get-text-property (min (1- (point-max)) (point)) 'org-series) |
| 7039 | (org-agenda-goto-block-beginning)) | 7039 | (org-agenda-goto-block-beginning)) |
| 7040 | (point-min)))) | 7040 | (point-min)))) |
| 7041 | 7041 | ||
| @@ -7090,7 +7090,7 @@ With prefix ARG, go forward that many times the current span." | |||
| 7090 | ;; `cmd' may have been set by `org-agenda-run-series' which | 7090 | ;; `cmd' may have been set by `org-agenda-run-series' which |
| 7091 | ;; uses `org-agenda-overriding-cmd' to decide whether | 7091 | ;; uses `org-agenda-overriding-cmd' to decide whether |
| 7092 | ;; overriding is allowed for `cmd' | 7092 | ;; overriding is allowed for `cmd' |
| 7093 | (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) | 7093 | (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) |
| 7094 | (org-agenda-overriding-arguments | 7094 | (org-agenda-overriding-arguments |
| 7095 | (list (car args) sd span))) | 7095 | (list (car args) sd span))) |
| 7096 | (org-agenda-redo) | 7096 | (org-agenda-redo) |
| @@ -7183,7 +7183,7 @@ SPAN may be `day', `week', `month', `year'." | |||
| 7183 | org-starting-day)) | 7183 | org-starting-day)) |
| 7184 | (sd (org-agenda-compute-starting-span sd span n)) | 7184 | (sd (org-agenda-compute-starting-span sd span n)) |
| 7185 | (org-agenda-overriding-cmd | 7185 | (org-agenda-overriding-cmd |
| 7186 | (get-text-property (min (1- (point-max)) (point)) 'org-serie-cmd)) | 7186 | (get-text-property (min (1- (point-max)) (point)) 'org-series-cmd)) |
| 7187 | (org-agenda-overriding-arguments | 7187 | (org-agenda-overriding-arguments |
| 7188 | (list (car args) sd span))) | 7188 | (list (car args) sd span))) |
| 7189 | (org-agenda-redo) | 7189 | (org-agenda-redo) |
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el index 3d67ae7892a..8b44d4936f5 100644 --- a/lisp/org/org-element.el +++ b/lisp/org/org-element.el | |||
| @@ -3924,7 +3924,7 @@ Return Org syntax as a string." | |||
| 3924 | (and (eq type 'paragraph) | 3924 | (and (eq type 'paragraph) |
| 3925 | (equal data (car (org-element-contents parent))) | 3925 | (equal data (car (org-element-contents parent))) |
| 3926 | (memq (org-element-type parent) | 3926 | (memq (org-element-type parent) |
| 3927 | '(footnote-definiton item)))))) | 3927 | '(footnote-definition item)))))) |
| 3928 | ""))) | 3928 | ""))) |
| 3929 | (funcall (intern (format "org-element-%s-interpreter" type)) | 3929 | (funcall (intern (format "org-element-%s-interpreter" type)) |
| 3930 | data | 3930 | data |
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index cfa4c1c30a5..51aead1b8bb 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el | |||
| @@ -293,7 +293,7 @@ column view defines special faces for each outline level. See the file | |||
| 293 | (((class color) (min-colors 8) (background dark)) (:foreground "red" :inverse-video t)) | 293 | (((class color) (min-colors 8) (background dark)) (:foreground "red" :inverse-video t)) |
| 294 | (t (:inverse-video t)))) | 294 | (t (:inverse-video t)))) |
| 295 | "Face for highlighting the calendar day when using `org-read-date'. | 295 | "Face for highlighting the calendar day when using `org-read-date'. |
| 296 | Using a bold face here might cause discrepencies while displaying the | 296 | Using a bold face here might cause discrepancies while displaying the |
| 297 | calendar." | 297 | calendar." |
| 298 | :group 'org-faces) | 298 | :group 'org-faces) |
| 299 | 299 | ||
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index 7a1eb7762de..dd493749295 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el | |||
| @@ -64,7 +64,7 @@ and `org-remember-default-headline'. To force prompting anyway, use | |||
| 64 | \\[universal-argument] \\[org-remember-finalize] to file the note. | 64 | \\[universal-argument] \\[org-remember-finalize] to file the note. |
| 65 | 65 | ||
| 66 | When this variable is nil, \\[org-remember-finalize] gives you the prompts, and | 66 | When this variable is nil, \\[org-remember-finalize] gives you the prompts, and |
| 67 | \\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." | 67 | \\[universal-argument] \\[org-remember-finalize] triggers the fast track." |
| 68 | :group 'org-remember | 68 | :group 'org-remember |
| 69 | :type 'boolean) | 69 | :type 'boolean) |
| 70 | 70 | ||
diff --git a/lisp/proced.el b/lisp/proced.el index be6cae2ef08..ec41ce65ef5 100644 --- a/lisp/proced.el +++ b/lisp/proced.el | |||
| @@ -1784,7 +1784,7 @@ supported but discouraged. It will be removed in a future version of Emacs." | |||
| 1784 | process-alist)))) | 1784 | process-alist)))) |
| 1785 | 1785 | ||
| 1786 | (unless (and signal process-alist) | 1786 | (unless (and signal process-alist) |
| 1787 | ;; Discouraged usge (supported for backward compatibility): | 1787 | ;; Discouraged usage (supported for backward compatibility): |
| 1788 | ;; The new calling sequence separates more cleanly between the parts | 1788 | ;; The new calling sequence separates more cleanly between the parts |
| 1789 | ;; of the code required for interactive and noninteractive calls so that | 1789 | ;; of the code required for interactive and noninteractive calls so that |
| 1790 | ;; the command can be used more flexibly in noninteractive ways, too. | 1790 | ;; the command can be used more flexibly in noninteractive ways, too. |
diff --git a/lisp/profiler.el b/lisp/profiler.el index efa23e7aec0..5e605957833 100644 --- a/lisp/profiler.el +++ b/lisp/profiler.el | |||
| @@ -495,7 +495,7 @@ return it." | |||
| 495 | t)))))) | 495 | t)))))) |
| 496 | 496 | ||
| 497 | (defun profiler-report-collapse-entry () | 497 | (defun profiler-report-collapse-entry () |
| 498 | "Collpase entry at point." | 498 | "Collapse entry at point." |
| 499 | (interactive) | 499 | (interactive) |
| 500 | (save-excursion | 500 | (save-excursion |
| 501 | (beginning-of-line) | 501 | (beginning-of-line) |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index b917d3f6429..d5aa73f5ef3 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -502,7 +502,7 @@ The type returned can be `comment', `string' or `paren'." | |||
| 502 | (and | 502 | (and |
| 503 | ;; Match even number of backslashes. | 503 | ;; Match even number of backslashes. |
| 504 | (or (not (any ?\\ ?\' ?\")) point | 504 | (or (not (any ?\\ ?\' ?\")) point |
| 505 | ;; Quotes might be preceeded by a escaped quote. | 505 | ;; Quotes might be preceded by a escaped quote. |
| 506 | (and (or (not (any ?\\)) point) ?\\ | 506 | (and (or (not (any ?\\)) point) ?\\ |
| 507 | (* ?\\ ?\\) (any ?\' ?\"))) | 507 | (* ?\\ ?\\) (any ?\' ?\"))) |
| 508 | (* ?\\ ?\\) | 508 | (* ?\\ ?\\) |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 86ffdf535a0..8c4167b6724 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -5148,7 +5148,7 @@ This sets up the appropriate Verilog mode environment, removes | |||
| 5148 | whitespace with \\[verilog-delete-trailing-whitespace] on all | 5148 | whitespace with \\[verilog-delete-trailing-whitespace] on all |
| 5149 | command-line files, and saves the buffers." | 5149 | command-line files, and saves the buffers." |
| 5150 | (unless noninteractive | 5150 | (unless noninteractive |
| 5151 | (error "Use verilog-batch-delete-trailing-whitepace only with --batch")) ;; Otherwise we'd mess up buffer modes | 5151 | (error "Use verilog-batch-delete-trailing-whitespace only with --batch")) ;; Otherwise we'd mess up buffer modes |
| 5152 | (verilog-batch-execute-func `verilog-delete-trailing-whitespace)) | 5152 | (verilog-batch-execute-func `verilog-delete-trailing-whitespace)) |
| 5153 | 5153 | ||
| 5154 | (defun verilog-batch-diff-auto () | 5154 | (defun verilog-batch-diff-auto () |
| @@ -12161,7 +12161,7 @@ Limitations: | |||
| 12161 | Interface names must be resolvable to filenames. See `verilog-auto-inst'. | 12161 | Interface names must be resolvable to filenames. See `verilog-auto-inst'. |
| 12162 | 12162 | ||
| 12163 | As with other autos, any inputs/outputs declared in the module | 12163 | As with other autos, any inputs/outputs declared in the module |
| 12164 | will suppress the AUTO from redeclarating an inputs/outputs by | 12164 | will suppress the AUTO from redeclaring an input/output by |
| 12165 | the same name. | 12165 | the same name. |
| 12166 | 12166 | ||
| 12167 | An example: | 12167 | An example: |
diff --git a/lisp/subr.el b/lisp/subr.el index 8dfe78d8c75..b0ffb0db746 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -3170,7 +3170,7 @@ in which case `save-window-excursion' cannot help." | |||
| 3170 | (set-window-hscroll window 0) | 3170 | (set-window-hscroll window 0) |
| 3171 | ;; Don't try this with NOFORCE non-nil! | 3171 | ;; Don't try this with NOFORCE non-nil! |
| 3172 | (set-window-start window (point-min) t) | 3172 | (set-window-start window (point-min) t) |
| 3173 | ;; This hould not be necessary. | 3173 | ;; This should not be necessary. |
| 3174 | (set-window-point window (point-min)) | 3174 | (set-window-point window (point-min)) |
| 3175 | ;; Run `temp-buffer-show-hook', with the chosen window selected. | 3175 | ;; Run `temp-buffer-show-hook', with the chosen window selected. |
| 3176 | (with-selected-window window | 3176 | (with-selected-window window |
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index 7052dcf473e..bdee0fcf1d4 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -2466,7 +2466,7 @@ information about your RefTeX version and configuration." | |||
| 2466 | "Remember to cover the basics, that is, what you expected to happen and | 2466 | "Remember to cover the basics, that is, what you expected to happen and |
| 2467 | what in fact did happen. | 2467 | what in fact did happen. |
| 2468 | 2468 | ||
| 2469 | Check if the bug is reproducable with an up-to-date version of | 2469 | Check if the bug is reproducible with an up-to-date version of |
| 2470 | RefTeX available from http://www.gnu.org/software/auctex/. | 2470 | RefTeX available from http://www.gnu.org/software/auctex/. |
| 2471 | 2471 | ||
| 2472 | If the bug is triggered by a specific \(La\)TeX file, you should try | 2472 | If the bug is triggered by a specific \(La\)TeX file, you should try |
diff --git a/lisp/window.el b/lisp/window.el index 811b1781b4c..41af7f9f44b 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -701,7 +701,7 @@ SIDE. Return the new window, nil if its creation window failed." | |||
| 701 | (set-window-parameter new 'delete-window 'delete-side-window) | 701 | (set-window-parameter new 'delete-window 'delete-side-window) |
| 702 | ;; Auto-adjust height/width of new window unless a size has been | 702 | ;; Auto-adjust height/width of new window unless a size has been |
| 703 | ;; explicitly requested. | 703 | ;; explicitly requested. |
| 704 | (unless (if left-or-right | 704 | (unless (if left-or-right |
| 705 | (cdr (assq 'window-width alist)) | 705 | (cdr (assq 'window-width alist)) |
| 706 | (cdr (assq 'window-height alist))) | 706 | (cdr (assq 'window-height alist))) |
| 707 | (setq alist | 707 | (setq alist |
| @@ -5615,7 +5615,7 @@ the selected one." | |||
| 5615 | buffer window 'reuse alist display-buffer-mark-dedicated))))) | 5615 | buffer window 'reuse alist display-buffer-mark-dedicated))))) |
| 5616 | 5616 | ||
| 5617 | (defun display-buffer-at-bottom (buffer alist) | 5617 | (defun display-buffer-at-bottom (buffer alist) |
| 5618 | "Try displaying BUFFER in a window at the botom of the selected frame. | 5618 | "Try displaying BUFFER in a window at the bottom of the selected frame. |
| 5619 | This either splits the window at the bottom of the frame or the | 5619 | This either splits the window at the bottom of the frame or the |
| 5620 | frame's root window, or reuses an existing window at the bottom | 5620 | frame's root window, or reuses an existing window at the bottom |
| 5621 | of the selected frame." | 5621 | of the selected frame." |
diff --git a/src/lread.c b/src/lread.c index 581332502ed..a2b6d1f26d9 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1700,7 +1700,7 @@ readevalloop (Lisp_Object readcharfun, | |||
| 1700 | if (NILP (Ffboundp (macroexpand)) | 1700 | if (NILP (Ffboundp (macroexpand)) |
| 1701 | /* Don't macroexpand in .elc files, since it should have been done | 1701 | /* Don't macroexpand in .elc files, since it should have been done |
| 1702 | already. We actually don't know whether we're in a .elc file or not, | 1702 | already. We actually don't know whether we're in a .elc file or not, |
| 1703 | so we use circumstancial evidence: .el files normally go through | 1703 | so we use circumstantial evidence: .el files normally go through |
| 1704 | Vload_source_file_function -> load-with-code-conversion | 1704 | Vload_source_file_function -> load-with-code-conversion |
| 1705 | -> eval-buffer. */ | 1705 | -> eval-buffer. */ |
| 1706 | || EQ (readcharfun, Qget_file_char) | 1706 | || EQ (readcharfun, Qget_file_char) |
diff --git a/src/unexmacosx.c b/src/unexmacosx.c index d38b91e955a..d304e85d490 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c | |||
| @@ -119,7 +119,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 119 | 119 | ||
| 120 | /* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7. | 120 | /* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7. |
| 121 | But it is used if we build with "Command Line Tools for Xcode 4.5 | 121 | But it is used if we build with "Command Line Tools for Xcode 4.5 |
| 122 | (OS X Lion) - Septemper 2012". */ | 122 | (OS X Lion) - September 2012". */ |
| 123 | #ifndef LC_DATA_IN_CODE | 123 | #ifndef LC_DATA_IN_CODE |
| 124 | #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */ | 124 | #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */ |
| 125 | #endif | 125 | #endif |