diff options
| author | Paul Eggert | 2011-11-14 15:59:56 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-14 15:59:56 -0800 |
| commit | 91af3942e9ab5540b3ab4dde6733bc883dc2abdd (patch) | |
| tree | 7a83e35278714a4498663fc968d36210d8c6436e | |
| parent | 5ef215d87480e348e432b4e323b1ba24e27ebf81 (diff) | |
| download | emacs-91af3942e9ab5540b3ab4dde6733bc883dc2abdd.tar.gz emacs-91af3942e9ab5540b3ab4dde6733bc883dc2abdd.zip | |
Spelling fixes.
112 files changed, 329 insertions, 337 deletions
diff --git a/admin/README b/admin/README index 4dd1705fe74..10a8f2244fc 100644 --- a/admin/README +++ b/admin/README | |||
| @@ -18,7 +18,7 @@ Living list of activities that must be completed before the next release. | |||
| 18 | 18 | ||
| 19 | ** make-tarball.txt | 19 | ** make-tarball.txt |
| 20 | 20 | ||
| 21 | Instructions to create pretest or release tarballs, annoucements, etc. | 21 | Instructions to create pretest or release tarballs, announcements, etc. |
| 22 | 22 | ||
| 23 | ** admin.el | 23 | ** admin.el |
| 24 | 24 | ||
| @@ -88,4 +88,3 @@ Local variables: | |||
| 88 | mode: outline | 88 | mode: outline |
| 89 | paragraph-separate: "[ ]*$" | 89 | paragraph-separate: "[ ]*$" |
| 90 | end: | 90 | end: |
| 91 | |||
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index e09ddd62b97..b3ea8af9d70 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c | |||
| @@ -40,7 +40,7 @@ void | |||
| 40 | usage (const char *progname) | 40 | usage (const char *progname) |
| 41 | { | 41 | { |
| 42 | fprintf (stderr, "Usage %s options\n", progname); | 42 | fprintf (stderr, "Usage %s options\n", progname); |
| 43 | fprintf (stderr, "-n NCOLORS allcoate NCOLORS colors\n"); | 43 | fprintf (stderr, "-n NCOLORS allocate NCOLORS colors\n"); |
| 44 | exit (1); | 44 | exit (1); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| @@ -111,4 +111,3 @@ main (int argc, char **argv) | |||
| 111 | XCloseDisplay (dpy); | 111 | XCloseDisplay (dpy); |
| 112 | return 0; | 112 | return 0; |
| 113 | } | 113 | } |
| 114 | |||
diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 9fbb6592b75..8c97261debd 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by | |||
| @@ -1105,7 +1105,7 @@ fun-or-proto-end | |||
| 1105 | ( t ) | 1105 | ( t ) |
| 1106 | | semantic-list | 1106 | | semantic-list |
| 1107 | ( nil ) | 1107 | ( nil ) |
| 1108 | ;; Here is an anoying feature of C++ pure virtual methods | 1108 | ;; Here is an annoying feature of C++ pure virtual methods |
| 1109 | | EQUAL ZERO SEMICOLON | 1109 | | EQUAL ZERO SEMICOLON |
| 1110 | ( :pure-virtual-flag ) | 1110 | ( :pure-virtual-flag ) |
| 1111 | | fun-try-end | 1111 | | fun-try-end |
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 85babb903b9..410e3aa8614 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions: | |||
| 160 | 160 | ||
| 161 | name="$1" | 161 | name="$1" |
| 162 | shift | 162 | shift |
| 163 | 163 | ||
| 164 | if [ -z "$name" ]; then | 164 | if [ -z "$name" ]; then |
| 165 | echo "Usage: connect_emacs <name> <args>..." >&2 | 165 | echo "Usage: connect_emacs <name> <args>..." >&2 |
| 166 | exit 1 | 166 | exit 1 |
| @@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER" | |||
| 184 | serverdir="/tmp/emacs$UID" | 184 | serverdir="/tmp/emacs$UID" |
| 185 | emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs | 185 | emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs |
| 186 | 186 | ||
| 187 | if [ -z "$name" ]; then | 187 | if [ -z "$name" ]; then |
| 188 | echo "Usage: preload_emacs <name> [<waitp>]" >&2 | 188 | echo "Usage: preload_emacs <name> [<waitp>]" >&2 |
| 189 | exit 1 | 189 | exit 1 |
| 190 | fi | 190 | fi |
| @@ -314,7 +314,7 @@ THINGS TO DO | |||
| 314 | Emacs with GTK support. If you want to play around with GTK | 314 | Emacs with GTK support. If you want to play around with GTK |
| 315 | multidisplay (and don't mind core dumps), you can edit src/config.h | 315 | multidisplay (and don't mind core dumps), you can edit src/config.h |
| 316 | and define HAVE_GTK_MULTIDISPLAY there by hand. | 316 | and define HAVE_GTK_MULTIDISPLAY there by hand. |
| 317 | 317 | ||
| 318 | http://bugzilla.gnome.org/show_bug.cgi?id=85715 | 318 | http://bugzilla.gnome.org/show_bug.cgi?id=85715 |
| 319 | 319 | ||
| 320 | Update: Han reports that GTK+ version 2.8.9 almost gets display | 320 | Update: Han reports that GTK+ version 2.8.9 almost gets display |
| @@ -414,7 +414,7 @@ THINGS TO DO | |||
| 414 | sometimes; Emacs does not respond to stimuli from other keyboards. | 414 | sometimes; Emacs does not respond to stimuli from other keyboards. |
| 415 | At least a beep or a message would be important, if the single-mode | 415 | At least a beep or a message would be important, if the single-mode |
| 416 | is still required to prevent interference. (Reported by Dan | 416 | is still required to prevent interference. (Reported by Dan |
| 417 | Nicolaescu.) | 417 | Nicolaescu.) |
| 418 | 418 | ||
| 419 | Update: selecting a region with the mouse enables single_kboard | 419 | Update: selecting a region with the mouse enables single_kboard |
| 420 | under X. This is very confusing. | 420 | under X. This is very confusing. |
| @@ -542,7 +542,7 @@ THINGS TO DO | |||
| 542 | are not useful; before starting work on DOS support, revert to | 542 | are not useful; before starting work on DOS support, revert to |
| 543 | pristine, pre-multi-tty versions. | 543 | pristine, pre-multi-tty versions. |
| 544 | 544 | ||
| 545 | ** Fix Windows support. Currently bootstraping works on w32, but Emacs | 545 | ** Fix Windows support. Currently bootstrapping works on w32, but Emacs |
| 546 | crashes on startup and none of the multi-tty features are | 546 | crashes on startup and none of the multi-tty features are |
| 547 | implemented. Many XXX comments mark things that probably need | 547 | implemented. Many XXX comments mark things that probably need |
| 548 | updating, ChangeLogs will help in spotting changes to X specific | 548 | updating, ChangeLogs will help in spotting changes to X specific |
| @@ -1026,7 +1026,7 @@ DIARY OF CHANGES | |||
| 1026 | settings as Emacs itself. This may lead to bogus results in a | 1026 | settings as Emacs itself. This may lead to bogus results in a |
| 1027 | multi-locale setup. (E.g., while logging in from a remote client | 1027 | multi-locale setup. (E.g., while logging in from a remote client |
| 1028 | with a different locale.) | 1028 | with a different locale.) |
| 1029 | (Update after new bugreport by Friedrich Delgado Friedrichs: | 1029 | (Update after new bugreport by Friedrich Delgado Friedrichs: |
| 1030 | (at least) the structs terminal_coding and keyboard_coding in | 1030 | (at least) the structs terminal_coding and keyboard_coding in |
| 1031 | coding.c must be moved to struct display, and the Lisp interface | 1031 | coding.c must be moved to struct display, and the Lisp interface |
| 1032 | [set-]keyboard-coding-system must be adapted for the change.) | 1032 | [set-]keyboard-coding-system must be adapted for the change.) |
| @@ -1088,7 +1088,7 @@ DIARY OF CHANGES | |||
| 1088 | -- Miles Bader suggests that C-x C-c on an emacsclient frame should | 1088 | -- Miles Bader suggests that C-x C-c on an emacsclient frame should |
| 1089 | only close the frame, not exit the entire Emacs session. Update: | 1089 | only close the frame, not exit the entire Emacs session. Update: |
| 1090 | see above for a function that does this. Maybe this should be the | 1090 | see above for a function that does this. Maybe this should be the |
| 1091 | new default? | 1091 | new default? |
| 1092 | 1092 | ||
| 1093 | (Done. This is the new default. No complaints so far.) | 1093 | (Done. This is the new default. No complaints so far.) |
| 1094 | 1094 | ||
| @@ -1131,7 +1131,7 @@ DIARY OF CHANGES | |||
| 1131 | from exiting Emacs. (Reported by Mnemonikk on freenode.) | 1131 | from exiting Emacs. (Reported by Mnemonikk on freenode.) |
| 1132 | 1132 | ||
| 1133 | (Done, I hope.) | 1133 | (Done, I hope.) |
| 1134 | 1134 | ||
| 1135 | 1135 | ||
| 1136 | -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow | 1136 | -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow |
| 1137 | keys on non-selected terminals under screen, and sometimes on other | 1137 | keys on non-selected terminals under screen, and sometimes on other |
| @@ -1157,7 +1157,7 @@ DIARY OF CHANGES | |||
| 1157 | > Cursor mode. Applications have to send the smkx and rmkx terminfo | 1157 | > Cursor mode. Applications have to send the smkx and rmkx terminfo |
| 1158 | > strings to switch between the 2 modes. So Emacs (and emacsclient) have | 1158 | > strings to switch between the 2 modes. So Emacs (and emacsclient) have |
| 1159 | > to send smkx when initializing and rmkx when quitting (or on | 1159 | > to send smkx when initializing and rmkx when quitting (or on |
| 1160 | > suspend). | 1160 | > suspend). |
| 1161 | 1161 | ||
| 1162 | (I think patch-370 fixed this.) | 1162 | (I think patch-370 fixed this.) |
| 1163 | 1163 | ||
| @@ -1166,7 +1166,7 @@ DIARY OF CHANGES | |||
| 1166 | 1166 | ||
| 1167 | emacs | 1167 | emacs |
| 1168 | M-x server-start | 1168 | M-x server-start |
| 1169 | 1169 | ||
| 1170 | # From another xterm: | 1170 | # From another xterm: |
| 1171 | emacsclient -e '(y-or-n-p "Do you want me to crash? ")' | 1171 | emacsclient -e '(y-or-n-p "Do you want me to crash? ")' |
| 1172 | # Notice how the answer ends up in the *scratch* buffer | 1172 | # Notice how the answer ends up in the *scratch* buffer |
| @@ -1205,7 +1205,7 @@ DIARY OF CHANGES | |||
| 1205 | it is not recognized correctly. May be related to the bug below. | 1205 | it is not recognized correctly. May be related to the bug below. |
| 1206 | 1206 | ||
| 1207 | (Seems to have been fixed as a side effect of patch-434. "The bug | 1207 | (Seems to have been fixed as a side effect of patch-434. "The bug |
| 1208 | below" was the set-input-mode madness.) | 1208 | below" was the set-input-mode madness.) |
| 1209 | 1209 | ||
| 1210 | (Update: this bug was fixed for good in patch-449. It was tracked | 1210 | (Update: this bug was fixed for good in patch-449. It was tracked |
| 1211 | down to a bug in `read_key_sequence': it failed to reinitialize its | 1211 | down to a bug in `read_key_sequence': it failed to reinitialize its |
| @@ -1359,4 +1359,3 @@ GNU General Public License for more details. | |||
| 1359 | 1359 | ||
| 1360 | You should have received a copy of the GNU General Public License | 1360 | You should have received a copy of the GNU General Public License |
| 1361 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 1361 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 1362 | |||
diff --git a/admin/notes/nextstep b/admin/notes/nextstep index 462101f9abf..cf0ebbc11aa 100644 --- a/admin/notes/nextstep +++ b/admin/notes/nextstep | |||
| @@ -78,7 +78,7 @@ Text Rendering and Font Handling | |||
| 78 | nsfont.m implements the font driver, responsible for managing fonts and | 78 | nsfont.m implements the font driver, responsible for managing fonts and |
| 79 | rendering text. Fonts are obtained through NSFontManager. Rendering must be | 79 | rendering text. Fonts are obtained through NSFontManager. Rendering must be |
| 80 | done at a low level due to emacs' fine control over this process, therefore | 80 | done at a low level due to emacs' fine control over this process, therefore |
| 81 | there are different approachs under Cocoa and GNUstep. Under GNUstep, the | 81 | there are different approaches under Cocoa and GNUstep. Under GNUstep, the |
| 82 | original NeXT Display PostScript (DPS) APIs are available and used. Under | 82 | original NeXT Display PostScript (DPS) APIs are available and used. Under |
| 83 | Cocoa, these were removed and Quartz drawing functions replaced them. | 83 | Cocoa, these were removed and Quartz drawing functions replaced them. |
| 84 | 84 | ||
| @@ -156,4 +156,3 @@ EmacsPrefsController : NSObject | |||
| 156 | EmacsSavePanel : NSSavePanel | 156 | EmacsSavePanel : NSSavePanel |
| 157 | EmacsOpenPanel : NSOpenPanel | 157 | EmacsOpenPanel : NSOpenPanel |
| 158 | - utility override for panel notifications | 158 | - utility override for panel notifications |
| 159 | |||
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index c2242c444dd..6801c7f1e0e 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi | |||
| @@ -206,7 +206,7 @@ use it, Snake and Tetris. | |||
| 206 | 206 | ||
| 207 | @item | 207 | @item |
| 208 | Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before | 208 | Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before |
| 209 | it is analysed for spam. | 209 | it is analyzed for spam. |
| 210 | 210 | ||
| 211 | @item | 211 | @item |
| 212 | Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a | 212 | Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a |
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index cca9e441ed4..ac62e2d9652 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi | |||
| @@ -1251,7 +1251,7 @@ screen Emacs frame. | |||
| 1251 | In all-stop mode, whenever your program stops, @emph{all} threads of | 1251 | In all-stop mode, whenever your program stops, @emph{all} threads of |
| 1252 | execution stop. Likewise, whenever you restart the program, all | 1252 | execution stop. Likewise, whenever you restart the program, all |
| 1253 | threads start executing. @xref{All-Stop Mode, , All-Stop Mode, gdb, | 1253 | threads start executing. @xref{All-Stop Mode, , All-Stop Mode, gdb, |
| 1254 | The GNU debugger}. You can enable this behaviour in Emacs by setting | 1254 | The GNU debugger}. You can enable this behavior in Emacs by setting |
| 1255 | @code{gdb-non-stop-setting} to @code{nil} before starting a debugging | 1255 | @code{gdb-non-stop-setting} to @code{nil} before starting a debugging |
| 1256 | session. | 1256 | session. |
| 1257 | 1257 | ||
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 5a97fa8460b..3e1e67fecd8 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi | |||
| @@ -120,7 +120,7 @@ Useful in this context is the listing of all faces obtained by @key{M-x} | |||
| 120 | 120 | ||
| 121 | @subsection Open files by dragging to an Emacs window | 121 | @subsection Open files by dragging to an Emacs window |
| 122 | 122 | ||
| 123 | The default behaviour when a user drags files from another application | 123 | The default behavior when a user drags files from another application |
| 124 | into an Emacs frame is to insert the contents of all the dragged files | 124 | into an Emacs frame is to insert the contents of all the dragged files |
| 125 | into the current buffer. To remap the @code{ns-drag-file} event to | 125 | into the current buffer. To remap the @code{ns-drag-file} event to |
| 126 | open the dragged files in the current frame use the following line: | 126 | open the dragged files in the current frame use the following line: |
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index d4f8ee9708b..51d91572d0e 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -420,7 +420,7 @@ remote files. | |||
| 420 | Per default, this variable is always set to @code{t}, meaning that a | 420 | Per default, this variable is always set to @code{t}, meaning that a |
| 421 | call of @code{process-file} could potentially change any file on a | 421 | call of @code{process-file} could potentially change any file on a |
| 422 | remote host. When set to @code{nil}, a file handler could optimize | 422 | remote host. When set to @code{nil}, a file handler could optimize |
| 423 | its behaviour with respect to remote file attributes caching. | 423 | its behavior with respect to remote file attributes caching. |
| 424 | 424 | ||
| 425 | This variable should never be changed by @code{setq}. Instead of, it | 425 | This variable should never be changed by @code{setq}. Instead of, it |
| 426 | shall be set only by let-binding. | 426 | shall be set only by let-binding. |
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f06405be625..ec12b77e826 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -2299,7 +2299,7 @@ | |||
| 2299 | 2009-08-25 Michael Albinus <michael.albinus@gmx.de> | 2299 | 2009-08-25 Michael Albinus <michael.albinus@gmx.de> |
| 2300 | 2300 | ||
| 2301 | * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping. | 2301 | * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping. |
| 2302 | Describe autostart behaviour of dbus-ping. | 2302 | Describe autostart behavior of dbus-ping. |
| 2303 | (Synchronous Methods, Asynchronous Methods): Use English numeric format | 2303 | (Synchronous Methods, Asynchronous Methods): Use English numeric format |
| 2304 | for timeout values. | 2304 | for timeout values. |
| 2305 | (Top): Remove footnote saying D-Bus is not enabled by | 2305 | (Top): Remove footnote saying D-Bus is not enabled by |
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 887e3f3c808..a4d377ebdce 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi | |||
| @@ -287,11 +287,11 @@ Configuration Basics | |||
| 287 | 287 | ||
| 288 | Styles | 288 | Styles |
| 289 | 289 | ||
| 290 | * Built-in Styles:: | 290 | * Built-in Styles:: |
| 291 | * Choosing a Style:: | 291 | * Choosing a Style:: |
| 292 | * Adding Styles:: | 292 | * Adding Styles:: |
| 293 | * Guessing the Style:: | 293 | * Guessing the Style:: |
| 294 | * File Styles:: | 294 | * File Styles:: |
| 295 | 295 | ||
| 296 | Customizing Auto-newlines | 296 | Customizing Auto-newlines |
| 297 | 297 | ||
| @@ -311,19 +311,19 @@ Indentation Engine Basics | |||
| 311 | 311 | ||
| 312 | Syntactic Symbols | 312 | Syntactic Symbols |
| 313 | 313 | ||
| 314 | * Function Symbols:: | 314 | * Function Symbols:: |
| 315 | * Class Symbols:: | 315 | * Class Symbols:: |
| 316 | * Conditional Construct Symbols:: | 316 | * Conditional Construct Symbols:: |
| 317 | * Switch Statement Symbols:: | 317 | * Switch Statement Symbols:: |
| 318 | * Brace List Symbols:: | 318 | * Brace List Symbols:: |
| 319 | * External Scope Symbols:: | 319 | * External Scope Symbols:: |
| 320 | * Paren List Symbols:: | 320 | * Paren List Symbols:: |
| 321 | * Literal Symbols:: | 321 | * Literal Symbols:: |
| 322 | * Multiline Macro Symbols:: | 322 | * Multiline Macro Symbols:: |
| 323 | * Objective-C Method Symbols:: | 323 | * Objective-C Method Symbols:: |
| 324 | * Java Symbols:: | 324 | * Java Symbols:: |
| 325 | * Statement Block Symbols:: | 325 | * Statement Block Symbols:: |
| 326 | * K&R Symbols:: | 326 | * K&R Symbols:: |
| 327 | 327 | ||
| 328 | Customizing Indentation | 328 | Customizing Indentation |
| 329 | 329 | ||
| @@ -343,8 +343,8 @@ Line-Up Functions | |||
| 343 | 343 | ||
| 344 | Customizing Macros | 344 | Customizing Macros |
| 345 | 345 | ||
| 346 | * Macro Backslashes:: | 346 | * Macro Backslashes:: |
| 347 | * Macros with ;:: | 347 | * Macros with ;:: |
| 348 | 348 | ||
| 349 | @end detailmenu | 349 | @end detailmenu |
| 350 | @end menu | 350 | @end menu |
| @@ -912,7 +912,7 @@ construct, should the point start inside it. If @ccmode fails to find | |||
| 912 | function beginnings or ends inside the current declaration scope, it | 912 | function beginnings or ends inside the current declaration scope, it |
| 913 | will search the enclosing scopes. If you want @ccmode to recognize | 913 | will search the enclosing scopes. If you want @ccmode to recognize |
| 914 | functions only at the top level@footnote{this was @ccmode{}'s | 914 | functions only at the top level@footnote{this was @ccmode{}'s |
| 915 | behaviour prior to version 5.32.}, set @code{c-defun-tatic} to | 915 | behavior prior to version 5.32.}, set @code{c-defun-tatic} to |
| 916 | @code{t}. | 916 | @code{t}. |
| 917 | 917 | ||
| 918 | These functions are analogous to the Emacs built-in commands | 918 | These functions are analogous to the Emacs built-in commands |
| @@ -2537,11 +2537,11 @@ As an alternative to writing a style definition yourself, you can have | |||
| 2537 | already formatted piece of your code, @ref{Guessing the Style}. | 2537 | already formatted piece of your code, @ref{Guessing the Style}. |
| 2538 | 2538 | ||
| 2539 | @menu | 2539 | @menu |
| 2540 | * Built-in Styles:: | 2540 | * Built-in Styles:: |
| 2541 | * Choosing a Style:: | 2541 | * Choosing a Style:: |
| 2542 | * Adding Styles:: | 2542 | * Adding Styles:: |
| 2543 | * Guessing the Style:: | 2543 | * Guessing the Style:: |
| 2544 | * File Styles:: | 2544 | * File Styles:: |
| 2545 | @end menu | 2545 | @end menu |
| 2546 | 2546 | ||
| 2547 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 2547 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| @@ -4266,19 +4266,19 @@ Java. @ref{Java Symbols}. | |||
| 4266 | @end table | 4266 | @end table |
| 4267 | 4267 | ||
| 4268 | @menu | 4268 | @menu |
| 4269 | * Function Symbols:: | 4269 | * Function Symbols:: |
| 4270 | * Class Symbols:: | 4270 | * Class Symbols:: |
| 4271 | * Conditional Construct Symbols:: | 4271 | * Conditional Construct Symbols:: |
| 4272 | * Switch Statement Symbols:: | 4272 | * Switch Statement Symbols:: |
| 4273 | * Brace List Symbols:: | 4273 | * Brace List Symbols:: |
| 4274 | * External Scope Symbols:: | 4274 | * External Scope Symbols:: |
| 4275 | * Paren List Symbols:: | 4275 | * Paren List Symbols:: |
| 4276 | * Literal Symbols:: | 4276 | * Literal Symbols:: |
| 4277 | * Multiline Macro Symbols:: | 4277 | * Multiline Macro Symbols:: |
| 4278 | * Objective-C Method Symbols:: | 4278 | * Objective-C Method Symbols:: |
| 4279 | * Java Symbols:: | 4279 | * Java Symbols:: |
| 4280 | * Statement Block Symbols:: | 4280 | * Statement Block Symbols:: |
| 4281 | * K&R Symbols:: | 4281 | * K&R Symbols:: |
| 4282 | @end menu | 4282 | @end menu |
| 4283 | 4283 | ||
| 4284 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 4284 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| @@ -6653,8 +6653,8 @@ these macros properly, see @ref{Macros with ;}. | |||
| 6653 | 6653 | ||
| 6654 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 6654 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 6655 | @menu | 6655 | @menu |
| 6656 | * Macro Backslashes:: | 6656 | * Macro Backslashes:: |
| 6657 | * Macros with ;:: | 6657 | * Macros with ;:: |
| 6658 | @end menu | 6658 | @end menu |
| 6659 | 6659 | ||
| 6660 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | 6660 | @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 74082bfd3b1..d2705155887 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi | |||
| @@ -379,7 +379,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el' | |||
| 379 | sudo is an alias, defined as "*sudo $*" | 379 | sudo is an alias, defined as "*sudo $*" |
| 380 | @end example | 380 | @end example |
| 381 | 381 | ||
| 382 | Some of the built-in commands have a special behaviour in Eshell: | 382 | Some of the built-in commands have a special behavior in Eshell: |
| 383 | 383 | ||
| 384 | @table @code | 384 | @table @code |
| 385 | 385 | ||
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index e8e89ed2a30..b5bb75f7284 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | @section Frequently Asked Questions | 12 | @section Frequently Asked Questions |
| 13 | 13 | ||
| 14 | @menu | 14 | @menu |
| 15 | * FAQ - Changes:: | 15 | * FAQ - Changes:: |
| 16 | * FAQ - Introduction:: About Gnus and this FAQ. | 16 | * FAQ - Introduction:: About Gnus and this FAQ. |
| 17 | * FAQ 1 - Installation FAQ:: Installation of Gnus. | 17 | * FAQ 1 - Installation FAQ:: Installation of Gnus. |
| 18 | * FAQ 2 - Startup / Group buffer:: Start up questions and the | 18 | * FAQ 2 - Startup / Group buffer:: Start up questions and the |
| @@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | This is the new Gnus Frequently Asked Questions list. | 38 | This is the new Gnus Frequently Asked Questions list. |
| 39 | 39 | ||
| 40 | Please submit features and suggestions to the | 40 | Please submit features and suggestions to the |
| 41 | @email{ding@@gnus.org, ding list}. | 41 | @email{ding@@gnus.org, ding list}. |
| 42 | 42 | ||
| 43 | @node FAQ - Changes | 43 | @node FAQ - Changes |
| @@ -166,7 +166,7 @@ package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs | |||
| 166 | 21 is outdated). | 166 | 21 is outdated). |
| 167 | You can get the latest released version of Gnus from | 167 | You can get the latest released version of Gnus from |
| 168 | @uref{http://www.gnus.org/dist/gnus.tar.gz} | 168 | @uref{http://www.gnus.org/dist/gnus.tar.gz} |
| 169 | or via anonymous FTP from | 169 | or via anonymous FTP from |
| 170 | @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}. | 170 | @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}. |
| 171 | 171 | ||
| 172 | @node FAQ 1-4 | 172 | @node FAQ 1-4 |
| @@ -176,7 +176,7 @@ What to do with the tarball now? | |||
| 176 | 176 | ||
| 177 | @subsubheading Answer | 177 | @subsubheading Answer |
| 178 | 178 | ||
| 179 | Untar it via @samp{tar xvzf gnus.tar.gz} and do the common | 179 | Untar it via @samp{tar xvzf gnus.tar.gz} and do the common |
| 180 | @samp{./configure; make; make install} circle. | 180 | @samp{./configure; make; make install} circle. |
| 181 | (under MS-Windows either get the Cygwin environment from | 181 | (under MS-Windows either get the Cygwin environment from |
| 182 | @uref{http://www.cygwin.com} | 182 | @uref{http://www.cygwin.com} |
| @@ -344,7 +344,7 @@ hit @samp{C-y}. | |||
| 344 | @subsection Getting Messages | 344 | @subsection Getting Messages |
| 345 | 345 | ||
| 346 | @menu | 346 | @menu |
| 347 | * FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} | 347 | * FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} |
| 348 | but it only says "nntp (news) open error", what to do? | 348 | but it only says "nntp (news) open error", what to do? |
| 349 | * FAQ 3-2:: I'm working under Windows and have no idea what | 349 | * FAQ 3-2:: I'm working under Windows and have no idea what |
| 350 | ~/.gnus.el means. | 350 | ~/.gnus.el means. |
| @@ -369,8 +369,8 @@ hit @samp{C-y}. | |||
| 369 | @node FAQ 3-1 | 369 | @node FAQ 3-1 |
| 370 | @subsubheading Question 3.1 | 370 | @subsubheading Question 3.1 |
| 371 | 371 | ||
| 372 | I just installed Gnus, started it via | 372 | I just installed Gnus, started it via |
| 373 | @samp{M-x gnus} | 373 | @samp{M-x gnus} |
| 374 | but it only says "nntp (news) open error", what to do? | 374 | but it only says "nntp (news) open error", what to do? |
| 375 | 375 | ||
| 376 | @subsubheading Answer | 376 | @subsubheading Answer |
| @@ -396,14 +396,14 @@ I'm working under Windows and have no idea what ~/.gnus.el means. | |||
| 396 | The ~/ means the home directory where Gnus and Emacs look | 396 | The ~/ means the home directory where Gnus and Emacs look |
| 397 | for the configuration files. However, you don't really | 397 | for the configuration files. However, you don't really |
| 398 | need to know what this means, it suffices that Emacs knows | 398 | need to know what this means, it suffices that Emacs knows |
| 399 | what it means :-) You can type | 399 | what it means :-) You can type |
| 400 | @samp{C-x C-f ~/.gnus.el RET } | 400 | @samp{C-x C-f ~/.gnus.el RET } |
| 401 | (yes, with the forward slash, even on Windows), and | 401 | (yes, with the forward slash, even on Windows), and |
| 402 | Emacs will open the right file for you. (It will most | 402 | Emacs will open the right file for you. (It will most |
| 403 | likely be new, and thus empty.) | 403 | likely be new, and thus empty.) |
| 404 | However, I'd discourage you from doing so, since the | 404 | However, I'd discourage you from doing so, since the |
| 405 | directory Emacs chooses will most certainly not be what | 405 | directory Emacs chooses will most certainly not be what |
| 406 | you want, so let's do it the correct way. | 406 | you want, so let's do it the correct way. |
| 407 | The first thing you've got to do is to | 407 | The first thing you've got to do is to |
| 408 | create a suitable directory (no blanks in directory name | 408 | create a suitable directory (no blanks in directory name |
| 409 | please) e.g. c:\myhome. Then you must set the environment | 409 | please) e.g. c:\myhome. Then you must set the environment |
| @@ -442,7 +442,7 @@ machine news.yourprovider.net login YourUserName password YourPassword | |||
| 442 | . | 442 | . |
| 443 | Make sure that the file isn't readable to others if you | 443 | Make sure that the file isn't readable to others if you |
| 444 | work on a OS which is capable of doing so. (Under Unix | 444 | work on a OS which is capable of doing so. (Under Unix |
| 445 | say | 445 | say |
| 446 | @example | 446 | @example |
| 447 | chmod 600 ~/.authinfo | 447 | chmod 600 ~/.authinfo |
| 448 | @end example | 448 | @end example |
| @@ -477,13 +477,13 @@ post on this server as well as I am, what's that? | |||
| 477 | 477 | ||
| 478 | Some providers allow restricted anonymous access and full | 478 | Some providers allow restricted anonymous access and full |
| 479 | access only after authorization. To make Gnus send authinfo | 479 | access only after authorization. To make Gnus send authinfo |
| 480 | to those servers append | 480 | to those servers append |
| 481 | 481 | ||
| 482 | @example | 482 | @example |
| 483 | force yes | 483 | force yes |
| 484 | @end example | 484 | @end example |
| 485 | @noindent | 485 | @noindent |
| 486 | 486 | ||
| 487 | to the line for those servers in ~/.authinfo. | 487 | to the line for those servers in ~/.authinfo. |
| 488 | 488 | ||
| 489 | @node FAQ 3-6 | 489 | @node FAQ 3-6 |
| @@ -774,7 +774,7 @@ When I enter a group, all read messages are gone. How to view them again? | |||
| 774 | 774 | ||
| 775 | @subsubheading Answer | 775 | @subsubheading Answer |
| 776 | 776 | ||
| 777 | If you enter the group by saying | 777 | If you enter the group by saying |
| 778 | @samp{RET} | 778 | @samp{RET} |
| 779 | in group buffer with point over the group, only unread and ticked messages are loaded. Say | 779 | in group buffer with point over the group, only unread and ticked messages are loaded. Say |
| 780 | @samp{C-u RET} | 780 | @samp{C-u RET} |
| @@ -787,13 +787,13 @@ Loading only unread messages can be annoying if you have threaded view enabled, | |||
| 787 | (setq gnus-fetch-old-headers 'some) | 787 | (setq gnus-fetch-old-headers 'some) |
| 788 | @end example | 788 | @end example |
| 789 | @noindent | 789 | @noindent |
| 790 | 790 | ||
| 791 | in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load | 791 | in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load |
| 792 | all articles (Warning: Both settings enlarge the amount of data which is | 792 | all articles (Warning: Both settings enlarge the amount of data which is |
| 793 | fetched when you enter a group and slow down the process of entering a group). | 793 | fetched when you enter a group and slow down the process of entering a group). |
| 794 | 794 | ||
| 795 | If you already use Gnus 5.10, you can say | 795 | If you already use Gnus 5.10, you can say |
| 796 | @samp{/o N} | 796 | @samp{/o N} |
| 797 | In summary buffer to load the last N messages, this feature is not available in 5.8.8 | 797 | In summary buffer to load the last N messages, this feature is not available in 5.8.8 |
| 798 | 798 | ||
| 799 | If you don't want all old messages, but the parent of the message you're just reading, | 799 | If you don't want all old messages, but the parent of the message you're just reading, |
| @@ -822,9 +822,9 @@ How to view the headers of a message? | |||
| 822 | 822 | ||
| 823 | @subsubheading Answer | 823 | @subsubheading Answer |
| 824 | 824 | ||
| 825 | Say @samp{t} | 825 | Say @samp{t} |
| 826 | to show all headers, one more | 826 | to show all headers, one more |
| 827 | @samp{t} | 827 | @samp{t} |
| 828 | hides them again. | 828 | hides them again. |
| 829 | 829 | ||
| 830 | @node FAQ 4-4 | 830 | @node FAQ 4-4 |
| @@ -834,10 +834,10 @@ How to view the raw unformatted message? | |||
| 834 | 834 | ||
| 835 | @subsubheading Answer | 835 | @subsubheading Answer |
| 836 | 836 | ||
| 837 | Say | 837 | Say |
| 838 | @samp{C-u g} | 838 | @samp{C-u g} |
| 839 | to show the raw message | 839 | to show the raw message |
| 840 | @samp{g} | 840 | @samp{g} |
| 841 | returns to normal view. | 841 | returns to normal view. |
| 842 | 842 | ||
| 843 | @node FAQ 4-5 | 843 | @node FAQ 4-5 |
| @@ -873,7 +873,7 @@ Say | |||
| 873 | 873 | ||
| 874 | @example | 874 | @example |
| 875 | (eval-after-load "mm-decode" | 875 | (eval-after-load "mm-decode" |
| 876 | '(progn | 876 | '(progn |
| 877 | (add-to-list 'mm-discouraged-alternatives "text/html") | 877 | (add-to-list 'mm-discouraged-alternatives "text/html") |
| 878 | (add-to-list 'mm-discouraged-alternatives "text/richtext"))) | 878 | (add-to-list 'mm-discouraged-alternatives "text/richtext"))) |
| 879 | @end example | 879 | @end example |
| @@ -1042,7 +1042,7 @@ back ends. Gnus thinks "highest-article-number - | |||
| 1042 | lowest-article-number = total-number-of-articles". This | 1042 | lowest-article-number = total-number-of-articles". This |
| 1043 | works OK for Usenet groups, but if you delete and move | 1043 | works OK for Usenet groups, but if you delete and move |
| 1044 | many messages in mail groups, this fails. To cure the | 1044 | many messages in mail groups, this fails. To cure the |
| 1045 | symptom, enter the group via @samp{C-u RET} | 1045 | symptom, enter the group via @samp{C-u RET} |
| 1046 | (this makes Gnus get all messages), then | 1046 | (this makes Gnus get all messages), then |
| 1047 | hit @samp{M P b} to mark all messages and | 1047 | hit @samp{M P b} to mark all messages and |
| 1048 | then say @samp{B m name.of.group} to move | 1048 | then say @samp{B m name.of.group} to move |
| @@ -1162,7 +1162,7 @@ general rule (regular expression .*) which denotes where | |||
| 1162 | articles should go which don't match any other rule. If | 1162 | articles should go which don't match any other rule. If |
| 1163 | the folder doesn't exist yet, it will be created as soon | 1163 | the folder doesn't exist yet, it will be created as soon |
| 1164 | as an article lands there. By default the mail will be | 1164 | as an article lands there. By default the mail will be |
| 1165 | send to all groups whose rules match. If you | 1165 | send to all groups whose rules match. If you |
| 1166 | don't want that (you probably don't want), say | 1166 | don't want that (you probably don't want), say |
| 1167 | 1167 | ||
| 1168 | @example | 1168 | @example |
| @@ -1203,7 +1203,7 @@ from using them): | |||
| 1203 | ("Spam" "^CC: .*azzrael@@t-online.invalid") | 1203 | ("Spam" "^CC: .*azzrael@@t-online.invalid") |
| 1204 | ("Spam" "^X-Mailer-Version: 1.50 BETA") | 1204 | ("Spam" "^X-Mailer-Version: 1.50 BETA") |
| 1205 | ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") | 1205 | ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") |
| 1206 | ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)") | 1206 | ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") |
| 1207 | ("Spam" ""))) | 1207 | ("Spam" ""))) |
| 1208 | @end example | 1208 | @end example |
| 1209 | @noindent | 1209 | @noindent |
| @@ -1393,13 +1393,13 @@ You can use ispell.el to spell-check stuff in Emacs. So the | |||
| 1393 | first thing to do is to make sure that you've got either | 1393 | first thing to do is to make sure that you've got either |
| 1394 | @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell} | 1394 | @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell} |
| 1395 | or @uref{http://aspell.sourceforge.net/, aspell} | 1395 | or @uref{http://aspell.sourceforge.net/, aspell} |
| 1396 | installed and in your Path. Then you need | 1396 | installed and in your Path. Then you need |
| 1397 | @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el} | 1397 | @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el} |
| 1398 | and for on-the-fly spell-checking | 1398 | and for on-the-fly spell-checking |
| 1399 | @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}. | 1399 | @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}. |
| 1400 | Ispell.el is shipped with Emacs and available through the XEmacs package system, | 1400 | Ispell.el is shipped with Emacs and available through the XEmacs package system, |
| 1401 | flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is | 1401 | flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is |
| 1402 | available through the package system, so there should be no need to install them | 1402 | available through the package system, so there should be no need to install them |
| 1403 | manually. | 1403 | manually. |
| 1404 | 1404 | ||
| 1405 | Ispell.el assumes you use ispell, if you choose aspell say | 1405 | Ispell.el assumes you use ispell, if you choose aspell say |
| @@ -1408,7 +1408,7 @@ Ispell.el assumes you use ispell, if you choose aspell say | |||
| 1408 | (setq ispell-program-name "aspell") | 1408 | (setq ispell-program-name "aspell") |
| 1409 | @end example | 1409 | @end example |
| 1410 | @noindent | 1410 | @noindent |
| 1411 | 1411 | ||
| 1412 | in your Emacs configuration file. | 1412 | in your Emacs configuration file. |
| 1413 | 1413 | ||
| 1414 | If you want your outgoing messages to be spell-checked, say | 1414 | If you want your outgoing messages to be spell-checked, say |
| @@ -1445,7 +1445,7 @@ Yes, say something like | |||
| 1445 | (ispell-change-dictionary "english"))))) | 1445 | (ispell-change-dictionary "english"))))) |
| 1446 | @end example | 1446 | @end example |
| 1447 | @noindent | 1447 | @noindent |
| 1448 | 1448 | ||
| 1449 | in ~/.gnus.el. Change "^de\\." and "deutsch8" to something | 1449 | in ~/.gnus.el. Change "^de\\." and "deutsch8" to something |
| 1450 | that suits your needs. | 1450 | that suits your needs. |
| 1451 | 1451 | ||
| @@ -1472,7 +1472,7 @@ cause Gnus to insert the full address for you. See the | |||
| 1472 | node "Mail Aliases" in Message (not Gnus) manual for | 1472 | node "Mail Aliases" in Message (not Gnus) manual for |
| 1473 | details. | 1473 | details. |
| 1474 | 1474 | ||
| 1475 | However, what you really want is the Insidious Big Brother | 1475 | However, what you really want is the Insidious Big Brother |
| 1476 | Database bbdb. Get it through the XEmacs package system or from | 1476 | Database bbdb. Get it through the XEmacs package system or from |
| 1477 | @uref{http://bbdb.sourceforge.net/, bbdb's homepage}. | 1477 | @uref{http://bbdb.sourceforge.net/, bbdb's homepage}. |
| 1478 | Now place the following in ~/.gnus.el, to activate bbdb for Gnus: | 1478 | Now place the following in ~/.gnus.el, to activate bbdb for Gnus: |
| @@ -1488,7 +1488,7 @@ place them in ~/.emacs: | |||
| 1488 | 1488 | ||
| 1489 | @example | 1489 | @example |
| 1490 | (require 'bbdb) | 1490 | (require 'bbdb) |
| 1491 | ;;If you don't live in Northern America, you should disable the | 1491 | ;;If you don't live in Northern America, you should disable the |
| 1492 | ;;syntax check for telephone numbers by saying | 1492 | ;;syntax check for telephone numbers by saying |
| 1493 | (setq bbdb-north-american-phone-numbers-p nil) | 1493 | (setq bbdb-north-american-phone-numbers-p nil) |
| 1494 | ;;Tell bbdb about your email address: | 1494 | ;;Tell bbdb about your email address: |
| @@ -1529,7 +1529,7 @@ X-Face. So fire up some image manipulation program (say | |||
| 1529 | Gimp), open the image you want to include, cut out the | 1529 | Gimp), open the image you want to include, cut out the |
| 1530 | relevant part, reduce color depth to 1 bit, resize to | 1530 | relevant part, reduce color depth to 1 bit, resize to |
| 1531 | 48*48 and save as bitmap. Now you should get the compface | 1531 | 48*48 and save as bitmap. Now you should get the compface |
| 1532 | package from | 1532 | package from |
| 1533 | @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}. | 1533 | @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}. |
| 1534 | and create the actual X-face by saying | 1534 | and create the actual X-face by saying |
| 1535 | 1535 | ||
| @@ -1539,7 +1539,7 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted | |||
| 1539 | @end example | 1539 | @end example |
| 1540 | @noindent | 1540 | @noindent |
| 1541 | 1541 | ||
| 1542 | If you can't use compface, there's an online X-face converter at | 1542 | If you can't use compface, there's an online X-face converter at |
| 1543 | @uref{http://www.dairiki.org/xface/}. | 1543 | @uref{http://www.dairiki.org/xface/}. |
| 1544 | If you use MS Windows, you could also use the WinFace program from | 1544 | If you use MS Windows, you could also use the WinFace program from |
| 1545 | @uref{http://www.xs4all.nl/~walterln/winface/}. | 1545 | @uref{http://www.xs4all.nl/~walterln/winface/}. |
| @@ -1668,7 +1668,7 @@ by saying: | |||
| 1668 | @noindent | 1668 | @noindent |
| 1669 | 1669 | ||
| 1670 | in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this | 1670 | in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this |
| 1671 | instead (works for newer versions as well): | 1671 | instead (works for newer versions as well): |
| 1672 | 1672 | ||
| 1673 | @example | 1673 | @example |
| 1674 | (eval-after-load "message" | 1674 | (eval-after-load "message" |
| @@ -1961,12 +1961,12 @@ receives the mail you write from Gnus and sends them | |||
| 1961 | when you're online. | 1961 | when you're online. |
| 1962 | 1962 | ||
| 1963 | Let's talk about Unix systems first: For the news part, | 1963 | Let's talk about Unix systems first: For the news part, |
| 1964 | the easiest solution is a small nntp server like | 1964 | the easiest solution is a small nntp server like |
| 1965 | @uref{http://www.leafnode.org/, Leafnode} or | 1965 | @uref{http://www.leafnode.org/, Leafnode} or |
| 1966 | @uref{http://infa.abo.fi/~patrik/sn/, sn}, | 1966 | @uref{http://infa.abo.fi/~patrik/sn/, sn}, |
| 1967 | of course you can also install a full featured news | 1967 | of course you can also install a full featured news |
| 1968 | server like | 1968 | server like |
| 1969 | @uref{http://www.isc.org/products/INN/, inn}. | 1969 | @uref{http://www.isc.org/products/INN/, inn}. |
| 1970 | Then you want to fetch your Mail, popular choices | 1970 | Then you want to fetch your Mail, popular choices |
| 1971 | are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail} | 1971 | are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail} |
| 1972 | and @uref{http://pyropus.ca/software/getmail/, getmail}. | 1972 | and @uref{http://pyropus.ca/software/getmail/, getmail}. |
| @@ -1978,8 +1978,8 @@ sending part: This can be done with every MTA like | |||
| 1978 | @uref{http://www.exim.org/, exim} or | 1978 | @uref{http://www.exim.org/, exim} or |
| 1979 | @uref{http://www.qmail.org/, qmail}. | 1979 | @uref{http://www.qmail.org/, qmail}. |
| 1980 | 1980 | ||
| 1981 | On windows boxes I'd vote for | 1981 | On windows boxes I'd vote for |
| 1982 | @uref{http://www.tglsoft.de/, Hamster}, | 1982 | @uref{http://www.tglsoft.de/, Hamster}, |
| 1983 | it's a small freeware, open-source program which fetches | 1983 | it's a small freeware, open-source program which fetches |
| 1984 | your mail and news from remote servers and offers them | 1984 | your mail and news from remote servers and offers them |
| 1985 | to Gnus (or any other mail and/or news reader) via nntp | 1985 | to Gnus (or any other mail and/or news reader) via nntp |
| @@ -2136,7 +2136,7 @@ Which mailing lists and newsgroups are there? | |||
| 2136 | @subsubheading Answer | 2136 | @subsubheading Answer |
| 2137 | 2137 | ||
| 2138 | There's the newsgroup gnu.emacs.gnus (also available as | 2138 | There's the newsgroup gnu.emacs.gnus (also available as |
| 2139 | @uref{http://dir.gmane.org/gmane.emacs.gnus.user, | 2139 | @uref{http://dir.gmane.org/gmane.emacs.gnus.user, |
| 2140 | gmane.emacs.gnus.user}) which deals with general Gnus | 2140 | gmane.emacs.gnus.user}) which deals with general Gnus |
| 2141 | questions. If you have questions about development versions of | 2141 | questions. If you have questions about development versions of |
| 2142 | Gnus, you should better ask on the ding mailing list, see below. | 2142 | Gnus, you should better ask on the ding mailing list, see below. |
| @@ -2149,7 +2149,7 @@ de.comm.software.gnus. | |||
| 2149 | 2149 | ||
| 2150 | The ding mailing list (ding@@gnus.org) deals with development of | 2150 | The ding mailing list (ding@@gnus.org) deals with development of |
| 2151 | Gnus. You can read the ding list via NNTP, too under the name | 2151 | Gnus. You can read the ding list via NNTP, too under the name |
| 2152 | @uref{http://dir.gmane.org/gmane.emacs.gnus.general, | 2152 | @uref{http://dir.gmane.org/gmane.emacs.gnus.general, |
| 2153 | gmane.emacs.gnus.general} from news.gmane.org. | 2153 | gmane.emacs.gnus.general} from news.gmane.org. |
| 2154 | 2154 | ||
| 2155 | @node FAQ 8-5 | 2155 | @node FAQ 8-5 |
| @@ -2160,7 +2160,7 @@ Where to report bugs? | |||
| 2160 | @subsubheading Answer | 2160 | @subsubheading Answer |
| 2161 | 2161 | ||
| 2162 | Say @samp{M-x gnus-bug}, this will start | 2162 | Say @samp{M-x gnus-bug}, this will start |
| 2163 | a message to the | 2163 | a message to the |
| 2164 | @email{bugs@@gnus.org, gnus bug mailing list} | 2164 | @email{bugs@@gnus.org, gnus bug mailing list} |
| 2165 | including information about your environment which make | 2165 | including information about your environment which make |
| 2166 | it easier to help you. | 2166 | it easier to help you. |
| @@ -2237,7 +2237,7 @@ building of summary say | |||
| 2237 | 2237 | ||
| 2238 | at the bottom of your ~/.gnus.el, this will make gnus | 2238 | at the bottom of your ~/.gnus.el, this will make gnus |
| 2239 | byte-compile things like | 2239 | byte-compile things like |
| 2240 | gnus-summary-line-format. | 2240 | gnus-summary-line-format. |
| 2241 | then you could increase the value of gc-cons-threshold | 2241 | then you could increase the value of gc-cons-threshold |
| 2242 | by saying something like | 2242 | by saying something like |
| 2243 | 2243 | ||
| @@ -2254,7 +2254,7 @@ recent GNU Emacs, you should say | |||
| 2254 | (setq gnus-use-correct-string-widths nil) | 2254 | (setq gnus-use-correct-string-widths nil) |
| 2255 | @end example | 2255 | @end example |
| 2256 | @noindent | 2256 | @noindent |
| 2257 | 2257 | ||
| 2258 | in ~/.gnus.el (thanks to Jesper harder for the last | 2258 | in ~/.gnus.el (thanks to Jesper harder for the last |
| 2259 | two suggestions). Finally if you are still using 5.8.8 | 2259 | two suggestions). Finally if you are still using 5.8.8 |
| 2260 | or 5.9 and experience speed problems with summary | 2260 | or 5.9 and experience speed problems with summary |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 545306e4dc7..6d9ffaf17d8 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -18001,7 +18001,7 @@ see the event's date. | |||
| 18001 | @code{gnus-diary} provides two supplemental user formats to be used in | 18001 | @code{gnus-diary} provides two supplemental user formats to be used in |
| 18002 | summary line formats. @code{D} corresponds to a formatted time string | 18002 | summary line formats. @code{D} corresponds to a formatted time string |
| 18003 | for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''), | 18003 | for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''), |
| 18004 | while @code{d} corresponds to an approximative remaining time until the | 18004 | while @code{d} corresponds to an approximate remaining time until the |
| 18005 | next occurrence of the event (e.g. ``in 6 months, 1 week''). | 18005 | next occurrence of the event (e.g. ``in 6 months, 1 week''). |
| 18006 | 18006 | ||
| 18007 | For example, here's how Joe's birthday is displayed in my | 18007 | For example, here's how Joe's birthday is displayed in my |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2a3d99ca7f4..9d164999b7c 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -3883,7 +3883,7 @@ special faces for some of them. This can be done using the variable | |||
| 3883 | @end lisp | 3883 | @end lisp |
| 3884 | 3884 | ||
| 3885 | While using a list with face properties as shown for CANCELED @emph{should} | 3885 | While using a list with face properties as shown for CANCELED @emph{should} |
| 3886 | work, this does not aways seem to be the case. If necessary, define a | 3886 | work, this does not always seem to be the case. If necessary, define a |
| 3887 | special face and use that. A string is interpreted as a color. The variable | 3887 | special face and use that. A string is interpreted as a color. The variable |
| 3888 | @code{org-faces-easy-properties} determines if that color is interpreted as a | 3888 | @code{org-faces-easy-properties} determines if that color is interpreted as a |
| 3889 | foreground or a background color. | 3889 | foreground or a background color. |
| @@ -5664,7 +5664,7 @@ an item: | |||
| 5664 | @orgcmd{C-c C-d,org-deadline} | 5664 | @orgcmd{C-c C-d,org-deadline} |
| 5665 | Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen | 5665 | Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen |
| 5666 | in the line directly following the headline. Any CLOSED timestamp will be | 5666 | in the line directly following the headline. Any CLOSED timestamp will be |
| 5667 | removed. When called with a prefix arg, an existing deadline will be removed | 5667 | removed. When called with a prefix arg, an existing deadline will be removed |
| 5668 | from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding | 5668 | from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding |
| 5669 | @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, | 5669 | @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, |
| 5670 | and @code{nologredeadline}}, a note will be taken when changing an existing | 5670 | and @code{nologredeadline}}, a note will be taken when changing an existing |
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 8853192af04..37ccc4045be 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi | |||
| @@ -56,7 +56,7 @@ developing GNU and promoting software freedom.'' | |||
| 56 | @top Supercite | 56 | @top Supercite |
| 57 | @comment node-name, next, previous, up | 57 | @comment node-name, next, previous, up |
| 58 | 58 | ||
| 59 | @insertcopying | 59 | @insertcopying |
| 60 | 60 | ||
| 61 | The manual is divided | 61 | The manual is divided |
| 62 | into the following chapters. | 62 | into the following chapters. |
| @@ -1877,7 +1877,7 @@ been continuously added through the comments and suggestions of the | |||
| 1877 | Supercite mailing list participants. | 1877 | Supercite mailing list participants. |
| 1878 | 1878 | ||
| 1879 | With version 3, Supercite underwent an almost complete rewrite, | 1879 | With version 3, Supercite underwent an almost complete rewrite, |
| 1880 | benefitting in a number of ways, including vast improvements in the | 1880 | benefiting in a number of ways, including vast improvements in the |
| 1881 | speed of performance, a big reduction in size of the code and in the use | 1881 | speed of performance, a big reduction in size of the code and in the use |
| 1882 | of Emacs resources, and a much cleaner and flexible internal | 1882 | of Emacs resources, and a much cleaner and flexible internal |
| 1883 | architecture. Most of this work was internal and not of very great | 1883 | architecture. Most of this work was internal and not of very great |
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f6cf7a07ae8..eb59f6d6b94 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi | |||
| @@ -349,7 +349,7 @@ This file also provides support for @code{semanticdb-minor-mode}, | |||
| 349 | which automatically associates files with tables in databases so that | 349 | which automatically associates files with tables in databases so that |
| 350 | tags are @emph{saved} while a buffer is not in memory. | 350 | tags are @emph{saved} while a buffer is not in memory. |
| 351 | 351 | ||
| 352 | The database and tables both also provide applicate cache information, | 352 | The database and tables both also provide applicable cache information, |
| 353 | and cache flushing system. The semanticdb search routines use caches | 353 | and cache flushing system. The semanticdb search routines use caches |
| 354 | to save datastructures that are complex to calculate. | 354 | to save datastructures that are complex to calculate. |
| 355 | 355 | ||
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index a4e06ab22f1..0accc6fac43 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -1575,7 +1575,7 @@ password handling. Consider @command{ssh-agent} for @option{ssh}-like | |||
| 1575 | methods, or @command{pageant} for @option{plink}-like methods. | 1575 | methods, or @command{pageant} for @option{plink}-like methods. |
| 1576 | 1576 | ||
| 1577 | However, if you cannot apply such native password handling, | 1577 | However, if you cannot apply such native password handling, |
| 1578 | @value{tramp} offers altenatives. | 1578 | @value{tramp} offers alternatives. |
| 1579 | 1579 | ||
| 1580 | 1580 | ||
| 1581 | @anchor{Using an authentication file} | 1581 | @anchor{Using an authentication file} |
diff --git a/etc/ChangeLog b/etc/ChangeLog index 1b1bc3f2abd..1db595b3175 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -375,7 +375,7 @@ | |||
| 375 | 375 | ||
| 376 | 2011-01-04 Jan Moringen <jan.moringen@uni-bielefeld.de> | 376 | 2011-01-04 Jan Moringen <jan.moringen@uni-bielefeld.de> |
| 377 | 377 | ||
| 378 | * NEWS: Extended behaviour of dbus-register-{method,property}. | 378 | * NEWS: Extended behavior of dbus-register-{method,property}. |
| 379 | 379 | ||
| 380 | 2011-01-02 Kenichi Handa <handa@m17n.org> | 380 | 2011-01-02 Kenichi Handa <handa@m17n.org> |
| 381 | 381 | ||
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index e8570cb7c48..d835cd6f33e 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 | |||
| @@ -1074,7 +1074,7 @@ Another `t' switches back to the usual display. | |||
| 1074 | 1074 | ||
| 1075 | * Rmail commands `a' and `k' set message attributes. | 1075 | * Rmail commands `a' and `k' set message attributes. |
| 1076 | `a' adds an attribute and `k' removes one. You specify | 1076 | `a' adds an attribute and `k' removes one. You specify |
| 1077 | the attrbute by name. You can specify either a built-in | 1077 | the attribute by name. You can specify either a built-in |
| 1078 | flag such as "deleted" or "filed", or a user-defined keyword | 1078 | flag such as "deleted" or "filed", or a user-defined keyword |
| 1079 | (anything not recognized as built-in). | 1079 | (anything not recognized as built-in). |
| 1080 | 1080 | ||
| @@ -2530,4 +2530,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 2530 | Local variables: | 2530 | Local variables: |
| 2531 | mode: text | 2531 | mode: text |
| 2532 | end: | 2532 | end: |
| 2533 | |||
diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 182a8a4a008..43c085ad803 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 | |||
| @@ -2102,7 +2102,7 @@ function to use for searching in `query-replace-regexp', | |||
| 2102 | *** New keymap `search-map' bound to `M-s' provides global bindings | 2102 | *** New keymap `search-map' bound to `M-s' provides global bindings |
| 2103 | for search related commands. | 2103 | for search related commands. |
| 2104 | 2104 | ||
| 2105 | *** New keymap `multi-query-replace-map' contains additonal keys bound | 2105 | *** New keymap `multi-query-replace-map' contains additional keys bound |
| 2106 | to `automatic-all' and `exit-current' for multi-buffer interactive replacement. | 2106 | to `automatic-all' and `exit-current' for multi-buffer interactive replacement. |
| 2107 | 2107 | ||
| 2108 | *** The variable `inhibit-changing-match-data', if non-nil, prevents | 2108 | *** The variable `inhibit-changing-match-data', if non-nil, prevents |
diff --git a/etc/PROBLEMS b/etc/PROBLEMS index e85972f0bfd..57a3387ee40 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS | |||
| @@ -1250,7 +1250,7 @@ be carried out at the same time: | |||
| 1250 | 4) Use lbxproxy on the remote end of the connection. This is an interface | 1250 | 4) Use lbxproxy on the remote end of the connection. This is an interface |
| 1251 | to the low bandwidth X extension in most modern X servers, which | 1251 | to the low bandwidth X extension in most modern X servers, which |
| 1252 | improves performance dramatically, at the slight expense of correctness | 1252 | improves performance dramatically, at the slight expense of correctness |
| 1253 | of the X protocol. lbxproxy acheives the performance gain by grouping | 1253 | of the X protocol. lbxproxy achieves the performance gain by grouping |
| 1254 | several X requests in one TCP packet and sending them off together, | 1254 | several X requests in one TCP packet and sending them off together, |
| 1255 | instead of requiring a round-trip for each X request in a separate | 1255 | instead of requiring a round-trip for each X request in a separate |
| 1256 | packet. The switches that seem to work best for emacs are: | 1256 | packet. The switches that seem to work best for emacs are: |
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 80a652ba25f..9132ece533e 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt | |||
| @@ -188,7 +188,7 @@ remove all hilit code from all the Gnus hooks | |||
| 188 | (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and | 188 | (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and |
| 189 | `gnus-summary-article-hook'). (Well, at the very least the first | 189 | `gnus-summary-article-hook'). (Well, at the very least the first |
| 190 | two.) Gnus provides various integrated functions for highlighting, | 190 | two.) Gnus provides various integrated functions for highlighting, |
| 191 | which are both faster and more accurated. | 191 | which are both faster and more accurate. |
| 192 | 192 | ||
| 193 | There is absolutely no chance, whatsoever, of getting Gnus to work | 193 | There is absolutely no chance, whatsoever, of getting Gnus to work |
| 194 | with Emacs 18. It won't even work on Emacsen older than Emacs | 194 | with Emacs 18. It won't even work on Emacsen older than Emacs |
| @@ -288,5 +288,3 @@ me the patches, but one can't have everything. | |||
| 288 | 288 | ||
| 289 | If you have any questions on usage, the "ding@ifi.uio.no" mailing list | 289 | If you have any questions on usage, the "ding@ifi.uio.no" mailing list |
| 290 | is where to post the questions. | 290 | is where to post the questions. |
| 291 | |||
| 292 | |||
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index d45392e93dd..b66a17a4be5 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt | |||
| @@ -55,7 +55,7 @@ goal | |||
| 55 | 55 | ||
| 56 | %% | 56 | %% |
| 57 | (define-lex wisent-{{TARGETMODE}}-lexer | 57 | (define-lex wisent-{{TARGETMODE}}-lexer |
| 58 | "Lexical analzer to handle {{TARGETMODE}} buffers." | 58 | "Lexical analyzer to handle {{TARGETMODE}} buffers." |
| 59 | ;; semantic-lex-newline | 59 | ;; semantic-lex-newline |
| 60 | semantic-lex-ignore-whitespace | 60 | semantic-lex-ignore-whitespace |
| 61 | semantic-lex-ignore-newline | 61 | semantic-lex-ignore-newline |
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index bd6bbaa88a2..55b07e6eaef 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | ;; reading mail/USENET. | 52 | ;; reading mail/USENET. |
| 53 | 53 | ||
| 54 | ;; In the message itself, quoted mail messages from different people | 54 | ;; In the message itself, quoted mail messages from different people |
| 55 | ;; are color coordinated, with high contrast beteen citations that are | 55 | ;; are color coordinated, with high contrast between citations that are |
| 56 | ;; close to each other in the heirarchy, so it is less likely that one | 56 | ;; close to each other in the heirarchy, so it is less likely that one |
| 57 | ;; misunderstands who said what in a long conversation. | 57 | ;; misunderstands who said what in a long conversation. |
| 58 | 58 | ||
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index aa9c9066dc1..e51e10df6a5 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 | |||
| @@ -5815,7 +5815,7 @@ | |||
| 5815 | querying the password for. | 5815 | querying the password for. |
| 5816 | 5816 | ||
| 5817 | * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers | 5817 | * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers |
| 5818 | behaviour, don't bury the ibuffer buffer when visiting other buffers. | 5818 | behavior, don't bury the ibuffer buffer when visiting other buffers. |
| 5819 | 5819 | ||
| 5820 | 2010-10-08 Chong Yidong <cyd@stupidchicken.com> | 5820 | 2010-10-08 Chong Yidong <cyd@stupidchicken.com> |
| 5821 | 5821 | ||
diff --git a/lisp/apropos.el b/lisp/apropos.el index 1dfe5cde9ed..9a372f27991 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el | |||
| @@ -1052,7 +1052,7 @@ If non-nil TEXT is a string that will be printed as a heading." | |||
| 1052 | ;; omitting any that contain a buffer or a frame. | 1052 | ;; omitting any that contain a buffer or a frame. |
| 1053 | ;; FIXME: Why omit keys that contain buffers and | 1053 | ;; FIXME: Why omit keys that contain buffers and |
| 1054 | ;; frames? This looks like a bad workaround rather | 1054 | ;; frames? This looks like a bad workaround rather |
| 1055 | ;; than a proper fix. Does anybod know what problem | 1055 | ;; than a proper fix. Does anybody know what problem |
| 1056 | ;; this is trying to address? --Stef | 1056 | ;; this is trying to address? --Stef |
| 1057 | (dolist (key keys) | 1057 | (dolist (key keys) |
| 1058 | (let ((i 0) | 1058 | (let ((i 0) |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index e3d1955ded5..4e45383eaec 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -1036,7 +1036,7 @@ using `make-temp-file', and the generated name is returned." | |||
| 1036 | (setq archive-file-name-coding-system file-name-coding) | 1036 | (setq archive-file-name-coding-system file-name-coding) |
| 1037 | (if (and | 1037 | (if (and |
| 1038 | (null | 1038 | (null |
| 1039 | (let (;; We may have to encode file name arguement for | 1039 | (let (;; We may have to encode the file name argument for |
| 1040 | ;; external programs. | 1040 | ;; external programs. |
| 1041 | (coding-system-for-write | 1041 | (coding-system-for-write |
| 1042 | (and enable-multibyte-characters | 1042 | (and enable-multibyte-characters |
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 14f09517b1d..987351a25e0 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el | |||
| @@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR." | |||
| 909 | ;; recomment as we go | 909 | ;; recomment as we go |
| 910 | ;;nil | 910 | ;;nil |
| 911 | )) | 911 | )) |
| 912 | ;; Do nothing if we are buiding an EDE project already | 912 | ;; Do nothing if we are building an EDE project already. |
| 913 | (ede-constructing | 913 | (ede-constructing |
| 914 | nil) | 914 | nil) |
| 915 | ;; Load in the project in question. | 915 | ;; Load in the project in question. |
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index b557d703f29..5ed83b39163 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el | |||
| @@ -249,7 +249,7 @@ All directories need at least one target.") | |||
| 249 | "EDE Generic Project target for Misc files. | 249 | "EDE Generic Project target for Misc files. |
| 250 | All directories need at least one target.") | 250 | All directories need at least one target.") |
| 251 | 251 | ||
| 252 | ;;; Automatic target aquisition. | 252 | ;;; Automatic target acquisition. |
| 253 | (defun ede-generic-find-matching-target (class dir targets) | 253 | (defun ede-generic-find-matching-target (class dir targets) |
| 254 | "Find a target that is a CLASS and is in DIR in the list of TARGETS." | 254 | "Find a target that is a CLASS and is in DIR in the list of TARGETS." |
| 255 | (let ((match nil)) | 255 | (let ((match nil)) |
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index a61fb6b1cf2..636ac30b166 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el | |||
| @@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error | |||
| 302 | (mapcar 'semantic-tag-type-members | 302 | (mapcar 'semantic-tag-type-members |
| 303 | tagtype)))) | 303 | tagtype)))) |
| 304 | (oset miniscope fullscope rawscope))) | 304 | (oset miniscope fullscope rawscope))) |
| 305 | ;; Now analayze the type to remove metatypes. | 305 | ;; Now analyze the type to remove metatypes. |
| 306 | (or (semantic-analyze-type tmp miniscope) | 306 | (or (semantic-analyze-type tmp miniscope) |
| 307 | tmp)) | 307 | tmp)) |
| 308 | (t | 308 | (t |
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 74c4d8e3788..35aef5d16ef 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el | |||
| @@ -918,7 +918,7 @@ but should be good enough for debugging assertions." | |||
| 918 | result | 918 | result |
| 919 | " ") | 919 | " ") |
| 920 | ">") | 920 | ">") |
| 921 | ;; Longer results should have an abreviated form. | 921 | ;; Longer results should have an abbreviated form. |
| 922 | (format "#<FIND RESULT %d TAGS in %d FILES>" | 922 | (format "#<FIND RESULT %d TAGS in %d FILES>" |
| 923 | (semanticdb-find-result-length result) | 923 | (semanticdb-find-result-length result) |
| 924 | (length result)))) | 924 | (length result)))) |
diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el index ee356ad3a9e..4eeac8de141 100644 --- a/lisp/cedet/semantic/decorate.el +++ b/lisp/cedet/semantic/decorate.el | |||
| @@ -107,7 +107,7 @@ the extent 'intangible' property does not exist." | |||
| 107 | "Hook used in modification hooks to prevent modification. | 107 | "Hook used in modification hooks to prevent modification. |
| 108 | Allows deletion of the entire text. | 108 | Allows deletion of the entire text. |
| 109 | Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system." | 109 | Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system." |
| 110 | ;; Stolen blithly from cpp.el in Emacs 21.1 | 110 | ;; Stolen blithely from cpp.el in Emacs 21.1 |
| 111 | (if (and (not after) | 111 | (if (and (not after) |
| 112 | (or (< (semantic-overlay-start overlay) start) | 112 | (or (< (semantic-overlay-start overlay) start) |
| 113 | (> (semantic-overlay-end overlay) end))) | 113 | (> (semantic-overlay-end overlay) end))) |
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index a37f43d177f..e32aca54b0f 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el | |||
| @@ -459,7 +459,7 @@ to add the path to Semantic's search. | |||
| 459 | If this is an include file that belongs to your project, then you may | 459 | If this is an include file that belongs to your project, then you may |
| 460 | need to update `semanticdb-project-roots' or better yet, use `ede' | 460 | need to update `semanticdb-project-roots' or better yet, use `ede' |
| 461 | to manage your project. See the ede manual for projects that will | 461 | to manage your project. See the ede manual for projects that will |
| 462 | wrap existing project code for Semantic's benifit. | 462 | wrap existing project code for Semantic's benefit. |
| 463 | ") | 463 | ") |
| 464 | 464 | ||
| 465 | (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) | 465 | (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) |
diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 69b1dba0bcf..3941424e4b5 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el | |||
| @@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." | |||
| 199 | ) | 199 | ) |
| 200 | (if pf | 200 | (if pf |
| 201 | (message "%s" (semantic-format-tag-summarize pf nil t)) | 201 | (message "%s" (semantic-format-tag-summarize pf nil t)) |
| 202 | (message "No summary info availalble")))) | 202 | (message "No summary info available")))) |
| 203 | 203 | ||
| 204 | ;;; Variants | 204 | ;;; Variants |
| 205 | ;; | 205 | ;; |
| @@ -245,7 +245,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." | |||
| 245 | ;; Jump to a destination based on the local context. | 245 | ;; Jump to a destination based on the local context. |
| 246 | ;; | 246 | ;; |
| 247 | ;; This shows how to use the analyzer context, and the | 247 | ;; This shows how to use the analyzer context, and the |
| 248 | ;; analyer references objects to choose a good destination. | 248 | ;; analyzer references objects to choose a good destination. |
| 249 | 249 | ||
| 250 | (defun semantic-ia--fast-jump-helper (dest) | 250 | (defun semantic-ia--fast-jump-helper (dest) |
| 251 | "Jump to DEST, a Semantic tag. | 251 | "Jump to DEST, a Semantic tag. |
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index e49968b07e7..5489765dcc8 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el | |||
| @@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil." | |||
| 709 | 709 | ||
| 710 | ;;; Symbol Is Macro | 710 | ;;; Symbol Is Macro |
| 711 | ;; | 711 | ;; |
| 712 | ;; An analyser that will push tokens from a macro in place | 712 | ;; An analyzer that will push tokens from a macro in place |
| 713 | ;; of the macro symbol. | 713 | ;; of the macro symbol. |
| 714 | ;; | 714 | ;; |
| 715 | (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) | 715 | (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) |
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index d6b8e1a8bf5..a9a5ab586d0 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el | |||
| @@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on | |||
| 1437 | ;;; Comment lexer | 1437 | ;;; Comment lexer |
| 1438 | ;; | 1438 | ;; |
| 1439 | ;; Predefined lexers that could be used instead of creating new | 1439 | ;; Predefined lexers that could be used instead of creating new |
| 1440 | ;; analyers. | 1440 | ;; analyzers. |
| 1441 | 1441 | ||
| 1442 | (define-lex semantic-comment-lexer | 1442 | (define-lex semantic-comment-lexer |
| 1443 | "A simple lexical analyzer that handles comments. | 1443 | "A simple lexical analyzer that handles comments. |
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 30c57571599..64e60fae0f2 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el | |||
| @@ -384,7 +384,7 @@ be found." | |||
| 384 | ;;------------------------------------------------------------ | 384 | ;;------------------------------------------------------------ |
| 385 | 385 | ||
| 386 | (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist) | 386 | (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist) |
| 387 | "Return accessable tags when TYPELIST and PARENTLIST is in scope. | 387 | "Return accessible tags when TYPELIST and PARENTLIST is in scope. |
| 388 | Tags returned are not in the global name space, but are instead | 388 | Tags returned are not in the global name space, but are instead |
| 389 | scoped inside a class or namespace. Such items can be referenced | 389 | scoped inside a class or namespace. Such items can be referenced |
| 390 | without use of \"object.function()\" style syntax due to an | 390 | without use of \"object.function()\" style syntax due to an |
diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index cae52428e75..f392379347a 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el | |||
| @@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are: | |||
| 73 | ) | 73 | ) |
| 74 | 74 | ||
| 75 | (defun srecode-calculate-nearby-things () | 75 | (defun srecode-calculate-nearby-things () |
| 76 | ;; NOTE: May need to add bounes to this FCN | 76 | ;; NOTE: May need to add bounds to this FCN |
| 77 | "Calculate the CONTEXT type items nearby the current point. | 77 | "Calculate the CONTEXT type items nearby the current point. |
| 78 | Assume that what we want to insert next is based on what is just | 78 | Assume that what we want to insert next is based on what is just |
| 79 | before point. If there is nothing, then assume it is whatever is | 79 | before point. If there is nothing, then assume it is whatever is |
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index a52cadbfb2c..61cbab19998 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el | |||
| @@ -811,8 +811,8 @@ not account for verb parts." | |||
| 811 | (if (string-match (car (car al)) (downcase ts)) | 811 | (if (string-match (car (car al)) (downcase ts)) |
| 812 | (progn | 812 | (progn |
| 813 | (setq newstr (concat newstr (cdr (car al)))) | 813 | (setq newstr (concat newstr (cdr (car al)))) |
| 814 | ;; don't terminate because we may actuall have 2 words | 814 | ;; don't terminate because we may actually have 2 words |
| 815 | ;; next to eachother we didn't identify before | 815 | ;; next to each other we didn't identify before |
| 816 | (setq llow t))) | 816 | (setq llow t))) |
| 817 | (setq al (cdr al))) | 817 | (setq al (cdr al))) |
| 818 | (if (not llow) (setq newstr (concat newstr ts))) | 818 | (if (not llow) (setq newstr (concat newstr ts))) |
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index 80e6f9d8d1c..d87dc315829 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | (oset st lastdict dict)) | 61 | (oset st lastdict dict)) |
| 62 | 62 | ||
| 63 | (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) | 63 | (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) |
| 64 | "Reset the achor point on extract state ST." | 64 | "Reset the anchor point on extract state ST." |
| 65 | (oset st anchor (point))) | 65 | (oset st anchor (point))) |
| 66 | 66 | ||
| 67 | (defmethod srecode-extract-state-extract ((st srecode-extract-state) | 67 | (defmethod srecode-extract-state-extract ((st srecode-extract-state) |
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 088781cfb53..d7ca84c1f97 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el | |||
| @@ -101,7 +101,7 @@ Has virtual :start and :end initializers.") | |||
| 101 | )) | 101 | )) |
| 102 | 102 | ||
| 103 | ;; Create a temporary overlay now. We have to use an overlay and | 103 | ;; Create a temporary overlay now. We have to use an overlay and |
| 104 | ;; not a marker becaues of the in-front insertion rules. The rules | 104 | ;; not a marker because of the in-front insertion rules. The rules |
| 105 | ;; are backward from what is wanted while typing. | 105 | ;; are backward from what is wanted while typing. |
| 106 | (setq olay (make-overlay start end (current-buffer) t nil)) | 106 | (setq olay (make-overlay start end (current-buffer) t nil)) |
| 107 | (overlay-put olay 'srecode-init-only t) | 107 | (overlay-put olay 'srecode-init-only t) |
diff --git a/lisp/comint.el b/lisp/comint.el index b91b82adb21..f25293ff3ac 100644 --- a/lisp/comint.el +++ b/lisp/comint.el | |||
| @@ -3442,7 +3442,7 @@ Also print a message when redirection is completed." | |||
| 3442 | :group 'comint | 3442 | :group 'comint |
| 3443 | :type 'boolean) | 3443 | :type 'boolean) |
| 3444 | 3444 | ||
| 3445 | ;; Directly analagous to comint-preoutput-filter-functions | 3445 | ;; Directly analogous to comint-preoutput-filter-functions |
| 3446 | (defvar comint-redirect-filter-functions nil | 3446 | (defvar comint-redirect-filter-functions nil |
| 3447 | "List of functions to call before inserting redirected process output. | 3447 | "List of functions to call before inserting redirected process output. |
| 3448 | Each function gets one argument, a string containing the text received | 3448 | Each function gets one argument, a string containing the text received |
diff --git a/lisp/desktop.el b/lisp/desktop.el index cdc787dfde9..f4991c5bcc6 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el | |||
| @@ -1176,7 +1176,7 @@ directory DIRNAME." | |||
| 1176 | (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count)) | 1176 | (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count)) |
| 1177 | (setq result nil)) | 1177 | (setq result nil)) |
| 1178 | ;; Restore buffer list order with new buffer at end. Don't change | 1178 | ;; Restore buffer list order with new buffer at end. Don't change |
| 1179 | ;; the order for old desktop files (old desktop module behaviour). | 1179 | ;; the order for old desktop files (old desktop module behavior). |
| 1180 | (unless (< desktop-file-version 206) | 1180 | (unless (< desktop-file-version 206) |
| 1181 | (mapc 'bury-buffer buffer-list) | 1181 | (mapc 'bury-buffer buffer-list) |
| 1182 | (when result (bury-buffer result))) | 1182 | (when result (bury-buffer result))) |
diff --git a/lisp/dired.el b/lisp/dired.el index 4e03d61a06e..90cf610116a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -1025,7 +1025,7 @@ BEG..END is the line where the file info is located." | |||
| 1025 | ;; spaces there (and within the filename as well, of course). | 1025 | ;; spaces there (and within the filename as well, of course). |
| 1026 | (save-excursion | 1026 | (save-excursion |
| 1027 | (let (file file-col other other-col) | 1027 | (let (file file-col other other-col) |
| 1028 | ;; Check that there is indeed a file, and that there is anoter adjacent | 1028 | ;; Check that there is indeed a file, and that there is another adjacent |
| 1029 | ;; file with which to align, and that additional spaces are needed to | 1029 | ;; file with which to align, and that additional spaces are needed to |
| 1030 | ;; align the filenames. | 1030 | ;; align the filenames. |
| 1031 | (when (and (setq file (progn (goto-char beg) | 1031 | (when (and (setq file (progn (goto-char beg) |
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 68a3440b179..119424e789c 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el | |||
| @@ -958,7 +958,7 @@ if default value is nil." | |||
| 958 | (progn | 958 | (progn |
| 959 | (eieio-perform-slot-validation-for-default a type value skipnil) | 959 | (eieio-perform-slot-validation-for-default a type value skipnil) |
| 960 | ;; Here we have found a :class version of a slot. This | 960 | ;; Here we have found a :class version of a slot. This |
| 961 | ;; requires a very different aproach. | 961 | ;; requires a very different approach. |
| 962 | (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a))) | 962 | (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a))) |
| 963 | (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc))) | 963 | (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc))) |
| 964 | (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type))) | 964 | (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type))) |
| @@ -2563,7 +2563,7 @@ This is usually a symbol that starts with `:'." | |||
| 2563 | 2563 | ||
| 2564 | ;;; | 2564 | ;;; |
| 2565 | ;; We want all objects created by EIEIO to have some default set of | 2565 | ;; We want all objects created by EIEIO to have some default set of |
| 2566 | ;; behaviours so we can create object utilities, and allow various | 2566 | ;; behaviors so we can create object utilities, and allow various |
| 2567 | ;; types of error checking. To do this, create the default EIEIO | 2567 | ;; types of error checking. To do this, create the default EIEIO |
| 2568 | ;; class, and when no parent class is specified, use this as the | 2568 | ;; class, and when no parent class is specified, use this as the |
| 2569 | ;; default. (But don't store it in the other classes as the default, | 2569 | ;; default. (But don't store it in the other classes as the default, |
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 901b6d1bf6a..9822b556f34 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el | |||
| @@ -434,7 +434,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." | |||
| 434 | nil | 434 | nil |
| 435 | (list (eldoc-current-symbol) argument-index))))) | 435 | (list (eldoc-current-symbol) argument-index))))) |
| 436 | 436 | ||
| 437 | ;; Move to the beginnig of current sexp. Return the number of nested | 437 | ;; Move to the beginning of current sexp. Return the number of nested |
| 438 | ;; sexp the point was over or after. | 438 | ;; sexp the point was over or after. |
| 439 | (defun eldoc-beginning-of-sexp () | 439 | (defun eldoc-beginning-of-sexp () |
| 440 | (let ((parse-sexp-ignore-comments t) | 440 | (let ((parse-sexp-ignore-comments t) |
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 56efd142198..2e388d20114 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el | |||
| @@ -393,7 +393,7 @@ FORM is of the form `(and FORM1 ...)'." | |||
| 393 | (defun rx-anything (form) | 393 | (defun rx-anything (form) |
| 394 | "Match any character." | 394 | "Match any character." |
| 395 | (if (consp form) | 395 | (if (consp form) |
| 396 | (error "rx `anythng' syntax error: %s" form)) | 396 | (error "rx `anything' syntax error: %s" form)) |
| 397 | (rx-or (list 'or 'not-newline ?\n))) | 397 | (rx-or (list 'or 'not-newline ?\n))) |
| 398 | 398 | ||
| 399 | 399 | ||
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 010e32857c5..71e607140de 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | ;; you put (setq crisp-load-scroll-all t) in your .emacs before | 34 | ;; you put (setq crisp-load-scroll-all t) in your .emacs before |
| 35 | ;; loading this package. If this feature is enabled, it will bind | 35 | ;; loading this package. If this feature is enabled, it will bind |
| 36 | ;; meta-f1 to the scroll-all mode toggle. The scroll-all package | 36 | ;; meta-f1 to the scroll-all mode toggle. The scroll-all package |
| 37 | ;; duplicates the scroll-alling feature in CRiSP. | 37 | ;; duplicates the scroll-all feature in CRiSP. |
| 38 | 38 | ||
| 39 | ;; Also, the default keybindings for brief/CRiSP override the M-x | 39 | ;; Also, the default keybindings for brief/CRiSP override the M-x |
| 40 | ;; key to exit the editor. If you don't like this functionality, you | 40 | ;; key to exit the editor. If you don't like this functionality, you |
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index a15e038dddc..74172b2573f 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el | |||
| @@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'." | |||
| 263 | "Set the away state globally. | 263 | "Set the away state globally. |
| 264 | 264 | ||
| 265 | If NOTEST is specified, do not check to see whether there is an | 265 | If NOTEST is specified, do not check to see whether there is an |
| 266 | activer server buffer available." | 266 | active server buffer available." |
| 267 | ;; Note that the idle timer runs, even when Emacs is inactive. In | 267 | ;; Note that the idle timer runs, even when Emacs is inactive. In |
| 268 | ;; order to prevent flooding when we connect, we test for an | 268 | ;; order to prevent flooding when we connect, we test for an |
| 269 | ;; existing process. | 269 | ;; existing process. |
| @@ -284,4 +284,3 @@ activer server buffer available." | |||
| 284 | ;; indent-tabs-mode: t | 284 | ;; indent-tabs-mode: t |
| 285 | ;; tab-width: 8 | 285 | ;; tab-width: 8 |
| 286 | ;; End: | 286 | ;; End: |
| 287 | |||
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 52c8c2ddc20..a7c92084bf9 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el | |||
| @@ -247,7 +247,7 @@ will have to visit the file 'eshell-cmd.el' and run the command | |||
| 247 | '(eshell-named-command | 247 | '(eshell-named-command |
| 248 | eshell-lisp-command | 248 | eshell-lisp-command |
| 249 | eshell-process-identity) | 249 | eshell-process-identity) |
| 250 | "A list of functions which might return an ansychronous process. | 250 | "A list of functions which might return an asynchronous process. |
| 251 | If they return a process object, execution of the calling Eshell | 251 | If they return a process object, execution of the calling Eshell |
| 252 | command will wait for completion (in the background) before finishing | 252 | command will wait for completion (in the background) before finishing |
| 253 | the command." | 253 | the command." |
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index fbbf3bad5a8..0a6e3a426a1 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1820,7 +1820,7 @@ | |||
| 1820 | 1820 | ||
| 1821 | 2011-03-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1821 | 2011-03-15 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 1822 | 1822 | ||
| 1823 | * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if | 1823 | * gnus-sum.el (gnus-articles-to-read): Revert back to old behavior if |
| 1824 | we're selecting a group with unread articles. | 1824 | we're selecting a group with unread articles. |
| 1825 | 1825 | ||
| 1826 | * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. | 1826 | * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. |
| @@ -4557,7 +4557,7 @@ | |||
| 4557 | 4557 | ||
| 4558 | * shr.el (shr-put-image): Use point even if only inserting text. | 4558 | * shr.el (shr-put-image): Use point even if only inserting text. |
| 4559 | (shr-put-image): Save excursion when inserting alt text on non-graphic | 4559 | (shr-put-image): Save excursion when inserting alt text on non-graphic |
| 4560 | display, so the behaviour is the same when we are on a graphic display. | 4560 | display, so the behavior is the same when we are on a graphic display. |
| 4561 | 4561 | ||
| 4562 | * nnir.el (nnir-run-swish-e): Remove hyrex support. | 4562 | * nnir.el (nnir-run-swish-e): Remove hyrex support. |
| 4563 | 4563 | ||
| @@ -5178,7 +5178,7 @@ | |||
| 5178 | bidning gnus-agent variables. | 5178 | bidning gnus-agent variables. |
| 5179 | 5179 | ||
| 5180 | * shr.el (shr-render-td): Use a cache for the table rendering function | 5180 | * shr.el (shr-render-td): Use a cache for the table rendering function |
| 5181 | to avoid getting an exponential rendering behaviour in nested tables. | 5181 | to avoid getting an exponential rendering behavior in nested tables. |
| 5182 | (shr-insert): Rework the line-breaking algorithm. | 5182 | (shr-insert): Rework the line-breaking algorithm. |
| 5183 | (shr-insert): Don't leave trailing spaces. | 5183 | (shr-insert): Don't leave trailing spaces. |
| 5184 | (shr-insert-table): Also insert empty TDs. | 5184 | (shr-insert-table): Also insert empty TDs. |
| @@ -6783,7 +6783,7 @@ | |||
| 6783 | 6783 | ||
| 6784 | * gnus-start.el (gnus-get-unread-articles): Allow the backends to | 6784 | * gnus-start.el (gnus-get-unread-articles): Allow the backends to |
| 6785 | update the group info. This makes the nndraft groups, for instance, go | 6785 | update the group info. This makes the nndraft groups, for instance, go |
| 6786 | back to their old behaviour. | 6786 | back to their old behavior. |
| 6787 | 6787 | ||
| 6788 | * gnus-sum.el (gnus-select-newsgroup): Indent. | 6788 | * gnus-sum.el (gnus-select-newsgroup): Indent. |
| 6789 | 6789 | ||
| @@ -7175,7 +7175,7 @@ | |||
| 7175 | 7175 | ||
| 7176 | * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default | 7176 | * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default |
| 7177 | so that nnimap methods aren't agentized by default. There's apparently | 7177 | so that nnimap methods aren't agentized by default. There's apparently |
| 7178 | many problems related to agent/imap behaviour. | 7178 | many problems related to agent/imap behavior. |
| 7179 | 7179 | ||
| 7180 | * gnus-art.el (gnus-article-copy-string): New command and key binding. | 7180 | * gnus-art.el (gnus-article-copy-string): New command and key binding. |
| 7181 | 7181 | ||
| @@ -7220,7 +7220,7 @@ | |||
| 7220 | storage than before. | 7220 | storage than before. |
| 7221 | 7221 | ||
| 7222 | * gnus.el (gnus-refer-article-method): Change default to 'current. | 7222 | * gnus.el (gnus-refer-article-method): Change default to 'current. |
| 7223 | When referring an article, the common behaviour is to refer it from the | 7223 | When referring an article, the common behavior is to refer it from the |
| 7224 | current select method, not the native select method. The chances of | 7224 | current select method, not the native select method. The chances of |
| 7225 | the native select method having the message in question is rather slim | 7225 | the native select method having the message in question is rather slim |
| 7226 | these days. | 7226 | these days. |
| @@ -7236,7 +7236,7 @@ | |||
| 7236 | * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so | 7236 | * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so |
| 7237 | that commands like `d' (and the like) go to the next line in the | 7237 | that commands like `d' (and the like) go to the next line in the |
| 7238 | buffer, instead of the next unread article. I think this is the | 7238 | buffer, instead of the next unread article. I think this is the |
| 7239 | behaviour that is most natural for most users. | 7239 | behavior that is most natural for most users. |
| 7240 | (gnus-single-article-buffer): Change default to nil, so that people can | 7240 | (gnus-single-article-buffer): Change default to nil, so that people can |
| 7241 | have as many article buffers open as they have summary buffer. I think | 7241 | have as many article buffers open as they have summary buffer. I think |
| 7242 | this is the most natural way for the groups to behave. | 7242 | this is the most natural way for the groups to behave. |
| @@ -16517,7 +16517,7 @@ | |||
| 16517 | 2005-06-16 Arne Jørgensen <arne@arnested.dk> | 16517 | 2005-06-16 Arne Jørgensen <arne@arnested.dk> |
| 16518 | 16518 | ||
| 16519 | * smime.el (smime-cert-by-ldap-1): Detect PEM format without | 16519 | * smime.el (smime-cert-by-ldap-1): Detect PEM format without |
| 16520 | header by looking for magic "MII" at the beginnig. | 16520 | header by looking for magic "MII" at the beginning. |
| 16521 | 16521 | ||
| 16522 | 2005-06-16 Miles Bader <miles@gnu.org> | 16522 | 2005-06-16 Miles Bader <miles@gnu.org> |
| 16523 | 16523 | ||
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0068fbad6e2..a11e9ebf0fa 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -1559,7 +1559,7 @@ node `(gnus)Gravatars' for details." | |||
| 1559 | gnus-treat-from-picon | 1559 | gnus-treat-from-picon |
| 1560 | gnus-treat-from-gravatar | 1560 | gnus-treat-from-gravatar |
| 1561 | gnus-treat-mail-gravatar) | 1561 | gnus-treat-mail-gravatar) |
| 1562 | ;; If there's much decoration, the user might prefer a boundery. | 1562 | ;; If there's much decoration, the user might prefer a boundary. |
| 1563 | 'head | 1563 | 'head |
| 1564 | nil) | 1564 | nil) |
| 1565 | "Draw a boundary at the end of the headers. | 1565 | "Draw a boundary at the end of the headers. |
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 0b5a7ebf1f9..9f86e74bd99 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el | |||
| @@ -157,7 +157,7 @@ There are currently two built-in format functions: | |||
| 157 | ;; I just ignore it. | 157 | ;; I just ignore it. |
| 158 | ;;;###autoload | 158 | ;;;###autoload |
| 159 | (defun gnus-user-format-function-d (header) | 159 | (defun gnus-user-format-function-d (header) |
| 160 | ;; Returns an aproximative delay string for the next occurrence of this | 160 | ;; Return an approximate delay string for the next occurrence of this |
| 161 | ;; message. The delay is given only in the first non zero unit. | 161 | ;; message. The delay is given only in the first non zero unit. |
| 162 | ;; Code partly stolen from article-make-date-line | 162 | ;; Code partly stolen from article-make-date-line |
| 163 | (let* ((extras (mail-header-extra header)) | 163 | (let* ((extras (mail-header-extra header)) |
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 7c63d5e2653..b18b78df063 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el | |||
| @@ -1678,7 +1678,7 @@ If SCAN, request a scan of that group as well." | |||
| 1678 | 1678 | ||
| 1679 | ;; Sort the methods based so that the primary and secondary | 1679 | ;; Sort the methods based so that the primary and secondary |
| 1680 | ;; methods come first. This is done for legacy reasons to try to | 1680 | ;; methods come first. This is done for legacy reasons to try to |
| 1681 | ;; ensure that side-effect behaviour doesn't change from previous | 1681 | ;; ensure that side-effect behavior doesn't change from previous |
| 1682 | ;; Gnus versions. | 1682 | ;; Gnus versions. |
| 1683 | (setq type-cache | 1683 | (setq type-cache |
| 1684 | (sort (nreverse type-cache) | 1684 | (sort (nreverse type-cache) |
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5e034b14fde..efdc237d11f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el | |||
| @@ -256,7 +256,7 @@ if the variable `help-downcase-arguments' is non-nil." | |||
| 256 | ;; so let's skip over it | 256 | ;; so let's skip over it |
| 257 | (search-backward "(") | 257 | (search-backward "(") |
| 258 | (goto-char (scan-sexps (point) 1))))) | 258 | (goto-char (scan-sexps (point) 1))))) |
| 259 | ;; Highlight aguments in the USAGE string | 259 | ;; Highlight arguments in the USAGE string |
| 260 | (setq usage (help-do-arg-highlight (buffer-string) args)) | 260 | (setq usage (help-do-arg-highlight (buffer-string) args)) |
| 261 | ;; Highlight arguments in the DOC string | 261 | ;; Highlight arguments in the DOC string |
| 262 | (setq doc (and doc (help-do-arg-highlight doc args)))))) | 262 | (setq doc (and doc (help-do-arg-highlight doc args)))))) |
diff --git a/lisp/info.el b/lisp/info.el index b3bdbc5e5be..0148ee544f9 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -264,7 +264,7 @@ Before leaving the initial Info node, where isearch was started, | |||
| 264 | it fails once with the error message [initial node], and with | 264 | it fails once with the error message [initial node], and with |
| 265 | subsequent C-s/C-r continues through other nodes without failing | 265 | subsequent C-s/C-r continues through other nodes without failing |
| 266 | with this error message in other nodes. When isearch fails for | 266 | with this error message in other nodes. When isearch fails for |
| 267 | the rest of the manual, it wraps aroung the whole manual and | 267 | the rest of the manual, it wraps around the whole manual and |
| 268 | restarts the search from the top/final node depending on | 268 | restarts the search from the top/final node depending on |
| 269 | search direction. | 269 | search direction. |
| 270 | 270 | ||
diff --git a/lisp/isearch.el b/lisp/isearch.el index 3ffe6e8a656..2013d7f7078 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -2243,7 +2243,7 @@ If there is no completion possible, say so and continue searching." | |||
| 2243 | ;; Searching | 2243 | ;; Searching |
| 2244 | 2244 | ||
| 2245 | (defvar isearch-search-fun-function nil | 2245 | (defvar isearch-search-fun-function nil |
| 2246 | "Overrides the default `isearch-search-fun' behaviour. | 2246 | "Overrides the default `isearch-search-fun' behavior. |
| 2247 | This variable's value should be a function, which will be called | 2247 | This variable's value should be a function, which will be called |
| 2248 | with no arguments, and should return a function that takes three | 2248 | with no arguments, and should return a function that takes three |
| 2249 | arguments: STRING, BOUND, and NOERROR. | 2249 | arguments: STRING, BOUND, and NOERROR. |
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index bb242a50acc..444f4d519da 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el | |||
| @@ -582,7 +582,7 @@ See also the descriptions of the variables | |||
| 582 | (narrow-to-region p (point)) | 582 | (narrow-to-region p (point)) |
| 583 | (robin-invert-region (point-min) (point-max) "ethiopic-sera") | 583 | (robin-invert-region (point-min) (point-max) "ethiopic-sera") |
| 584 | 584 | ||
| 585 | ;; ethio-quote-vowel-alwyas | 585 | ;; ethio-quote-vowel-always |
| 586 | (goto-char (point-min)) | 586 | (goto-char (point-min)) |
| 587 | (while (re-search-forward "'[eauio]" nil t) | 587 | (while (re-search-forward "'[eauio]" nil t) |
| 588 | (save-excursion | 588 | (save-excursion |
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 81c5577fa57..83386f2e852 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el | |||
| @@ -372,7 +372,7 @@ indicate the place to embed a consonant. | |||
| 372 | 372 | ||
| 373 | Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL | 373 | Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL |
| 374 | follwoing a consonant and preceding a maa-sakod character. If it is | 374 | follwoing a consonant and preceding a maa-sakod character. If it is |
| 375 | nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is alwasy | 375 | nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always |
| 376 | appended at the tail. | 376 | appended at the tail. |
| 377 | 377 | ||
| 378 | For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel | 378 | For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel |
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 8847c16bfb4..744560a8223 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el | |||
| @@ -20621,7 +20621,7 @@ normalized footnotes towards the end of the pre-processing buffer. | |||
| 20621 | Some exporters like docbook, odt, etc. expect that footnote | 20621 | Some exporters like docbook, odt, etc. expect that footnote |
| 20622 | definitions be available before any references to them. Such | 20622 | definitions be available before any references to them. Such |
| 20623 | exporters can let bind `org-footnote-insert-pos-for-preprocessor' to | 20623 | exporters can let bind `org-footnote-insert-pos-for-preprocessor' to |
| 20624 | symbol 'point-min to achieve the desired behaviour. | 20624 | symbol 'point-min to achieve the desired behavior. |
| 20625 | 20625 | ||
| 20626 | Additional note on `org-footnote-insert-pos-for-preprocessor': | 20626 | Additional note on `org-footnote-insert-pos-for-preprocessor': |
| 20627 | 1. This variable has not effect when FOR-PREPROCESSOR is nil. | 20627 | 1. This variable has not effect when FOR-PREPROCESSOR is nil. |
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index f4b29958aab..d0907b078ac 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el | |||
| @@ -1356,7 +1356,7 @@ for you. Add this function to `mail-send-hook' with something like this: | |||
| 1356 | (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) | 1356 | (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) |
| 1357 | 1357 | ||
| 1358 | Then add the functions you want called to either `feedmail-mail-send-hook-queued' | 1358 | Then add the functions you want called to either `feedmail-mail-send-hook-queued' |
| 1359 | or `feedmail-mail-send-hook', as apprpriate. The distinction is that | 1359 | or `feedmail-mail-send-hook', as appropriate. The distinction is that |
| 1360 | `feedmail-mail-send-hook' will be called when you send mail from a composition | 1360 | `feedmail-mail-send-hook' will be called when you send mail from a composition |
| 1361 | buffer (typically by typing C-c C-c), whether the message is sent immediately | 1361 | buffer (typically by typing C-c C-c), whether the message is sent immediately |
| 1362 | or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is | 1362 | or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is |
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index d1b3ccebf46..c6d60b3b2e2 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el | |||
| @@ -272,7 +272,7 @@ Blind aliases or users from /etc/passwd are not expanded." | |||
| 272 | (completing-read prompt mh-alias-alist nil nil) ","))))) | 272 | (completing-read prompt mh-alias-alist nil nil) ","))))) |
| 273 | (if (not mh-alias-expand-aliases-flag) | 273 | (if (not mh-alias-expand-aliases-flag) |
| 274 | (mapconcat 'identity the-answer ", ") | 274 | (mapconcat 'identity the-answer ", ") |
| 275 | ;; Loop over all elements, checking if in passwd aliast or blind first | 275 | ;; Loop over all elements, checking if in passwd alias or blind first |
| 276 | (mapconcat 'mh-alias-expand the-answer ",\n "))))) | 276 | (mapconcat 'mh-alias-expand the-answer ",\n "))))) |
| 277 | 277 | ||
| 278 | ;;;###mh-autoload | 278 | ;;;###mh-autoload |
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 3f1437f0799..791e566fc8e 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | ;; | 26 | ;; |
| 27 | ;; This package provides a simple method of inserting a URL based on the | 27 | ;; This package provides a simple method of inserting a URL based on the |
| 28 | ;; text at point in the current buffer. This is part of an on-going effort | 28 | ;; text at point in the current buffer. This is part of an on-going effort |
| 29 | ;; to increase the information I provide people while reducing the ammount | 29 | ;; to increase the information I provide people while reducing the amount |
| 30 | ;; of typing I need to do. No-doubt there are undiscovered Emacs packages | 30 | ;; of typing I need to do. No-doubt there are undiscovered Emacs packages |
| 31 | ;; out there that do all of this and do it better, feel free to point me to | 31 | ;; out there that do all of this and do it better, feel free to point me to |
| 32 | ;; them, in the mean time I'm having fun playing with Emacs Lisp. | 32 | ;; them, in the mean time I'm having fun playing with Emacs Lisp. |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 55732194bc8..6cba1a5b7a6 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -4307,7 +4307,7 @@ connection if a previous connection has died for some reason." | |||
| 4307 | (tramp-compat-temporary-file-directory))))) | 4307 | (tramp-compat-temporary-file-directory))))) |
| 4308 | spec) | 4308 | spec) |
| 4309 | 4309 | ||
| 4310 | ;; Add arguments for asynchrononous processes. | 4310 | ;; Add arguments for asynchronous processes. |
| 4311 | (when (and process-name async-args) | 4311 | (when (and process-name async-args) |
| 4312 | (setq login-args (append async-args login-args))) | 4312 | (setq login-args (append async-args login-args))) |
| 4313 | 4313 | ||
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index 9060e091587..cc538c224dc 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el | |||
| @@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN. | |||
| 249 | APROTOCOL stands for the network protocol family ADDRESS is | 249 | APROTOCOL stands for the network protocol family ADDRESS is |
| 250 | encoded (`zeroconf-avahi-protocol-inet4' means INET4, | 250 | encoded (`zeroconf-avahi-protocol-inet4' means INET4, |
| 251 | `zeroconf-avahi-protocol-inet6' means INET6). It can be | 251 | `zeroconf-avahi-protocol-inet6' means INET6). It can be |
| 252 | different from PROTOCOL, when an adrress resolution has been | 252 | different from PROTOCOL, when an address resolution has been |
| 253 | requested for another protocol family but the default one. | 253 | requested for another protocol family but the default one. |
| 254 | 254 | ||
| 255 | ADDRESS is the service address, encoded according to the | 255 | ADDRESS is the service address, encoded according to the |
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index cb06091dfcf..347db281f1a 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | ;; In `iso-accents-mode', pseudo accent characters are used to | 32 | ;; In `iso-accents-mode', pseudo accent characters are used to |
| 33 | ;; introduce accented keys. The pseudo-accent characters are: | 33 | ;; introduce accented keys. The pseudo-accent characters are: |
| 34 | ;; | 34 | ;; |
| 35 | ;; ' (minute) -> actue accent | 35 | ;; ' (minute) -> acute accent |
| 36 | ;; ` (backtick) -> grave accent | 36 | ;; ` (backtick) -> grave accent |
| 37 | ;; " (second) -> diaeresis | 37 | ;; " (second) -> diaeresis |
| 38 | ;; ^ (caret) -> circumflex | 38 | ;; ^ (caret) -> circumflex |
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 704da5fa68e..d4f993fedf6 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -7163,7 +7163,7 @@ | |||
| 7163 | src blocks. | 7163 | src blocks. |
| 7164 | (org-speed-command-default-hook): The default hook for | 7164 | (org-speed-command-default-hook): The default hook for |
| 7165 | org-speed-command-hook. Factored out from org-self-insert-command | 7165 | org-speed-command-hook. Factored out from org-self-insert-command |
| 7166 | and mimics existing behaviour. | 7166 | and mimics existing behavior. |
| 7167 | (org-self-insert-command): Modified to use org-speed-command-hook. | 7167 | (org-self-insert-command): Modified to use org-speed-command-hook. |
| 7168 | 7168 | ||
| 7169 | 2010-11-11 Carsten Dominik <carsten.dominik@gmail.com> | 7169 | 2010-11-11 Carsten Dominik <carsten.dominik@gmail.com> |
| @@ -10577,7 +10577,7 @@ | |||
| 10577 | a list of symbols specifying which of the special keywords #+DATE, | 10577 | a list of symbols specifying which of the special keywords #+DATE, |
| 10578 | #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock. | 10578 | #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock. |
| 10579 | (org-fontify-meta-lines-and-blocks): Changes to font-lock code | 10579 | (org-fontify-meta-lines-and-blocks): Changes to font-lock code |
| 10580 | implementing new faces and hiding behaviour. | 10580 | implementing new faces and hiding behavior. |
| 10581 | 10581 | ||
| 10582 | * org-faces.el (org-document-title): New face for #+TITLE lines. | 10582 | * org-faces.el (org-document-title): New face for #+TITLE lines. |
| 10583 | (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines. | 10583 | (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines. |
| @@ -16482,14 +16482,14 @@ | |||
| 16482 | 2008-11-23 Carsten Dominik <carsten.dominik@gmail.com> | 16482 | 2008-11-23 Carsten Dominik <carsten.dominik@gmail.com> |
| 16483 | 16483 | ||
| 16484 | * org-export-latex.el (org-export-latex-subcontent): | 16484 | * org-export-latex.el (org-export-latex-subcontent): |
| 16485 | Interprete target aliases as additonal labels. | 16485 | Interprete target aliases as additional labels. |
| 16486 | 16486 | ||
| 16487 | * org-exp.el (org-export-target-aliases): New variable. | 16487 | * org-exp.el (org-export-target-aliases): New variable. |
| 16488 | (org-export-preprocess-string) | 16488 | (org-export-preprocess-string) |
| 16489 | (org-export-handle-invisible-targets): Fill the alias alist. | 16489 | (org-export-handle-invisible-targets): Fill the alias alist. |
| 16490 | (org-export-as-html): Remove the from the anchor, and also | 16490 | (org-export-as-html): Remove the from the anchor, and also |
| 16491 | assign an id. | 16491 | assign an id. |
| 16492 | (org-html-level-start): Insert the target aliases as additonal | 16492 | (org-html-level-start): Insert the target aliases as additional |
| 16493 | anchors. | 16493 | anchors. |
| 16494 | 16494 | ||
| 16495 | * org.el (org-edit-fixed-width-region): Fix bug when starting a new | 16495 | * org.el (org-edit-fixed-width-region): Fix bug when starting a new |
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 5cebe50efd1..9f40c5bd9d5 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el | |||
| @@ -451,7 +451,7 @@ The effect is that these values will be accessible during export." | |||
| 451 | ((stringp org-beamer-frame-level-now) | 451 | ((stringp org-beamer-frame-level-now) |
| 452 | (setq org-beamer-frame-level-now | 452 | (setq org-beamer-frame-level-now |
| 453 | (string-to-number org-beamer-frame-level-now)))) | 453 | (string-to-number org-beamer-frame-level-now)))) |
| 454 | ;; Find the header additons, most likely theme commands | 454 | ;; Find the header additions, most likely theme commands |
| 455 | (setq org-beamer-header-extra | 455 | (setq org-beamer-header-extra |
| 456 | (or (and (org-region-active-p) | 456 | (or (and (org-region-active-p) |
| 457 | (save-excursion | 457 | (save-excursion |
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 48eced9ea08..352d414a4b6 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el | |||
| @@ -64,19 +64,19 @@ | |||
| 64 | ;; with the same name as the link; then, if unsuccessful, ask the user if | 64 | ;; with the same name as the link; then, if unsuccessful, ask the user if |
| 65 | ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if | 65 | ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if |
| 66 | ;; the user wishes to append 'tag' as a new toplevel heading at the end of | 66 | ;; the user wishes to append 'tag' as a new toplevel heading at the end of |
| 67 | ;; the buffer; and finally, defer to org's default behaviour which is to | 67 | ;; the buffer; and finally, defer to org's default behavior which is to |
| 68 | ;; search the entire text of the current buffer for 'tag'. | 68 | ;; search the entire text of the current buffer for 'tag'. |
| 69 | ;; | 69 | ;; |
| 70 | ;; This behaviour can be modified by changing the value of | 70 | ;; This behavior can be modified by changing the value of |
| 71 | ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my | 71 | ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my |
| 72 | ;; .emacs, which describes the same behaviour as the above paragraph with | 72 | ;; .emacs, which describes the same behavior as the above paragraph with |
| 73 | ;; one difference: | 73 | ;; one difference: |
| 74 | ;; | 74 | ;; |
| 75 | ;; (setq org-ctags-open-link-functions | 75 | ;; (setq org-ctags-open-link-functions |
| 76 | ;; '(org-ctags-find-tag | 76 | ;; '(org-ctags-find-tag |
| 77 | ;; org-ctags-ask-rebuild-tags-file-then-find-tag | 77 | ;; org-ctags-ask-rebuild-tags-file-then-find-tag |
| 78 | ;; org-ctags-ask-append-topic | 78 | ;; org-ctags-ask-append-topic |
| 79 | ;; org-ctags-fail-silently)) ; <-- prevents org default behaviour | 79 | ;; org-ctags-fail-silently)) ; <-- prevents org default behavior |
| 80 | ;; | 80 | ;; |
| 81 | ;; | 81 | ;; |
| 82 | ;; Usage | 82 | ;; Usage |
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 223d2573fdb..0d47132d2f8 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el | |||
| @@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer. | |||
| 574 | Some exporters like docbook, odt, etc. expect that footnote | 574 | Some exporters like docbook, odt, etc. expect that footnote |
| 575 | definitions be available before any references to them. Such | 575 | definitions be available before any references to them. Such |
| 576 | exporters can let bind `org-footnote-insert-pos-for-preprocessor' to | 576 | exporters can let bind `org-footnote-insert-pos-for-preprocessor' to |
| 577 | symbol 'point-min to achieve the desired behaviour. | 577 | symbol 'point-min to achieve the desired behavior. |
| 578 | 578 | ||
| 579 | Additional note on `org-footnote-insert-pos-for-preprocessor': | 579 | Additional note on `org-footnote-insert-pos-for-preprocessor': |
| 580 | 1. This variable has not effect when FOR-PREPROCESSOR is nil. | 580 | 1. This variable has not effect when FOR-PREPROCESSOR is nil. |
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index ddb3cf7b63a..0c924cd9f07 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el | |||
| @@ -191,7 +191,7 @@ sitemap of files or summary page for a given project. | |||
| 191 | display folders first or last, respectively. | 191 | display folders first or last, respectively. |
| 192 | Any other value will mix files and folders. | 192 | Any other value will mix files and folders. |
| 193 | :sitemap-sort-files The site map is normally sorted alphabetically. | 193 | :sitemap-sort-files The site map is normally sorted alphabetically. |
| 194 | You can change this behaviour setting this to | 194 | You can change this behavior setting this to |
| 195 | `chronologically', `anti-chronologically' or nil. | 195 | `chronologically', `anti-chronologically' or nil. |
| 196 | :sitemap-ignore-case Should sorting be case-sensitive? Default nil. | 196 | :sitemap-ignore-case Should sorting be case-sensitive? Default nil. |
| 197 | 197 | ||
| @@ -1114,7 +1114,7 @@ so that the file including them will be republished as well." | |||
| 1114 | (let ((ctime (org-publish-cache-ctime-of-src filename))) | 1114 | (let ((ctime (org-publish-cache-ctime-of-src filename))) |
| 1115 | (or (< pstamp ctime) | 1115 | (or (< pstamp ctime) |
| 1116 | (when included-files-ctime | 1116 | (when included-files-ctime |
| 1117 | (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) | 1117 | (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) |
| 1118 | included-files-ctime)))))))))) | 1118 | included-files-ctime)))))))))) |
| 1119 | 1119 | ||
| 1120 | (defun org-publish-cache-set-file-property (filename property value &optional project-name) | 1120 | (defun org-publish-cache-set-file-property (filename property value &optional project-name) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 10531b07325..a22cf4d6efc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -11217,7 +11217,7 @@ changes. Such blocking occurs when: | |||
| 11217 | (forward-line 1) | 11217 | (forward-line 1) |
| 11218 | (re-search-forward org-not-done-heading-regexp pos t)) | 11218 | (re-search-forward org-not-done-heading-regexp pos t)) |
| 11219 | (throw 'dont-block nil)) ; block, there is an older sibling not done. | 11219 | (throw 'dont-block nil)) ; block, there is an older sibling not done. |
| 11220 | ;; Search further up the hierarchy, to see if an anchestor is blocked | 11220 | ;; Search further up the hierarchy, to see if an ancestor is blocked |
| 11221 | (while t | 11221 | (while t |
| 11222 | (goto-char parent-pos) | 11222 | (goto-char parent-pos) |
| 11223 | (if (not (looking-at org-not-done-heading-regexp)) | 11223 | (if (not (looking-at org-not-done-heading-regexp)) |
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 86e6b4abb6c..1ea8df36cd6 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el | |||
| @@ -151,7 +151,7 @@ | |||
| 151 | "Local keymap for the 5x5 game.") | 151 | "Local keymap for the 5x5 game.") |
| 152 | 152 | ||
| 153 | (5x5-defvar-local 5x5-solver-output nil | 153 | (5x5-defvar-local 5x5-solver-output nil |
| 154 | "List that is is the output of artihmetic solver. | 154 | "List that is is the output of an arithmetic solver. |
| 155 | 155 | ||
| 156 | This list L is such that | 156 | This list L is such that |
| 157 | 157 | ||
| @@ -162,8 +162,8 @@ M is the move count when the solve output was stored. | |||
| 162 | S_1 ... S_N are all the solutions ordered from least to greatest | 162 | S_1 ... S_N are all the solutions ordered from least to greatest |
| 163 | number of strokes. S_1 is the solution to be displayed. | 163 | number of strokes. S_1 is the solution to be displayed. |
| 164 | 164 | ||
| 165 | Each solution S_1, ..., S_N is a a list (STROKE-COUNT GRID) where | 165 | Each solution S_1, ..., S_N is a list (STROKE-COUNT GRID) where |
| 166 | STROKE-COUNT is to number of strokes to achieve the solution and | 166 | STROKE-COUNT is the number of strokes to achieve the solution and |
| 167 | GRID is the grid of positions to click.") | 167 | GRID is the grid of positions to click.") |
| 168 | 168 | ||
| 169 | 169 | ||
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4a57a1eef67..4cf00cd3cfd 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el | |||
| @@ -1747,7 +1747,7 @@ Information is extracted from the ali file." | |||
| 1747 | 1747 | ||
| 1748 | (unless declaration-found | 1748 | (unless declaration-found |
| 1749 | 1749 | ||
| 1750 | ;; Since we alread know the number of the file, search for a direct | 1750 | ;; Since we already know the number of the file, search for a direct |
| 1751 | ;; reference to it | 1751 | ;; reference to it |
| 1752 | (goto-char (point-min)) | 1752 | (goto-char (point-min)) |
| 1753 | (set 'declaration-found t) | 1753 | (set 'declaration-found t) |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ea0a8f2d3b3..fd32e5e956c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info." | |||
| 988 | ;; Just gone back over an ordinary symbol of some sort? | 988 | ;; Just gone back over an ordinary symbol of some sort? |
| 989 | (t (c-crosses-statement-barrier-p | 989 | (t (c-crosses-statement-barrier-p |
| 990 | (point) maybe-after-boundary-pos)))) | 990 | (point) maybe-after-boundary-pos)))) |
| 991 | 991 | ||
| 992 | (when boundary-pos | 992 | (when boundary-pos |
| 993 | (setq pptok ptok | 993 | (setq pptok ptok |
| 994 | ptok tok | 994 | ptok tok |
| @@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info." | |||
| 1065 | pos tok) ; always non-nil | 1065 | pos tok) ; always non-nil |
| 1066 | ) ; end of (catch loop ....) | 1066 | ) ; end of (catch loop ....) |
| 1067 | ) ; end of sexp-at-a-time (while ....) | 1067 | ) ; end of sexp-at-a-time (while ....) |
| 1068 | 1068 | ||
| 1069 | ;; If the stack isn't empty there might be errors to report. | 1069 | ;; If the stack isn't empty there might be errors to report. |
| 1070 | (while stack | 1070 | (while stack |
| 1071 | (if (and (vectorp saved-pos) (eq (length saved-pos) 3)) | 1071 | (if (and (vectorp saved-pos) (eq (length saved-pos) 3)) |
| @@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info." | |||
| 1795 | rung-is-marked simple-ws-beg cmt-skip-pos) | 1795 | rung-is-marked simple-ws-beg cmt-skip-pos) |
| 1796 | 1796 | ||
| 1797 | ;; Skip simple horizontal ws and do a quick check on the preceding | 1797 | ;; Skip simple horizontal ws and do a quick check on the preceding |
| 1798 | ;; character to see if it's anying that can't end syntactic ws, so we can | 1798 | ;; character to see if it's anything that can't end syntactic ws, so we can |
| 1799 | ;; bail out early in the majority of cases when there just are a few ws | 1799 | ;; bail out early in the majority of cases when there just are a few ws |
| 1800 | ;; chars. Newlines are complicated in the backward direction, so we can't | 1800 | ;; chars. Newlines are complicated in the backward direction, so we can't |
| 1801 | ;; skip over them. | 1801 | ;; skip over them. |
| @@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info." | |||
| 4051 | ;; a relevant match. | 4051 | ;; a relevant match. |
| 4052 | (goto-char pos) | 4052 | (goto-char pos) |
| 4053 | nil)))))) | 4053 | nil)))))) |
| 4054 | 4054 | ||
| 4055 | (> (point) | 4055 | (> (point) |
| 4056 | (progn | 4056 | (progn |
| 4057 | ;; Skip syntactic ws afterwards so that we don't stop at the | 4057 | ;; Skip syntactic ws afterwards so that we don't stop at the |
| @@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info." | |||
| 6277 | ;; car ^ ^ point | 6277 | ;; car ^ ^ point |
| 6278 | ;; Foo::Foo (int b) : Base (b) {} | 6278 | ;; Foo::Foo (int b) : Base (b) {} |
| 6279 | ;; car ^ ^ point | 6279 | ;; car ^ ^ point |
| 6280 | ;; | 6280 | ;; |
| 6281 | ;; The cdr of the return value is non-nil when a | 6281 | ;; The cdr of the return value is non-nil when a |
| 6282 | ;; `c-typedef-decl-kwds' specifier is found in the declaration. | 6282 | ;; `c-typedef-decl-kwds' specifier is found in the declaration. |
| 6283 | ;; Specifically it is a dotted pair (A . B) where B is t when a | 6283 | ;; Specifically it is a dotted pair (A . B) where B is t when a |
| @@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info." | |||
| 6285 | ;; other `c-typedef-decl-kwds' (e.g. class, struct, enum) | 6285 | ;; other `c-typedef-decl-kwds' (e.g. class, struct, enum) |
| 6286 | ;; specifier is present. I.e., (some of) the declared | 6286 | ;; specifier is present. I.e., (some of) the declared |
| 6287 | ;; identifier(s) are types. | 6287 | ;; identifier(s) are types. |
| 6288 | ;; | 6288 | ;; |
| 6289 | ;; If a cast is parsed: | 6289 | ;; If a cast is parsed: |
| 6290 | ;; | 6290 | ;; |
| 6291 | ;; The point is left at the first token after the closing paren of | 6291 | ;; The point is left at the first token after the closing paren of |
| @@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info." | |||
| 8461 | nil) | 8461 | nil) |
| 8462 | (t nil)))) | 8462 | (t nil)))) |
| 8463 | (eolp)) | 8463 | (eolp)) |
| 8464 | 8464 | ||
| 8465 | (goto-char pos) | 8465 | (goto-char pos) |
| 8466 | (progn (c-backward-syntactic-ws) | 8466 | (progn (c-backward-syntactic-ws) |
| 8467 | (eq (point) pos)) | 8467 | (eq (point) pos)) |
| @@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info." | |||
| 8922 | ;; FIXME: Should use c-add-stmt-syntax, but it's not yet | 8922 | ;; FIXME: Should use c-add-stmt-syntax, but it's not yet |
| 8923 | ;; template aware. | 8923 | ;; template aware. |
| 8924 | (c-add-syntax 'template-args-cont (point) placeholder)) | 8924 | (c-add-syntax 'template-args-cont (point) placeholder)) |
| 8925 | 8925 | ||
| 8926 | ;; CASE D: continued statement. | 8926 | ;; CASE D: continued statement. |
| 8927 | (t | 8927 | (t |
| 8928 | (c-beginning-of-statement-1 containing-sexp) | 8928 | (c-beginning-of-statement-1 containing-sexp) |
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index c7e78cb282a..02256ead392 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el | |||
| @@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like: | |||
| 963 | [foo blahBlahBlah: fred | 963 | [foo blahBlahBlah: fred |
| 964 | thisIsTooDamnLong: barney | 964 | thisIsTooDamnLong: barney |
| 965 | 965 | ||
| 966 | This behaviour can be overridden by customizing the indentation of | 966 | This behavior can be overridden by customizing the indentation of |
| 967 | `objc-method-call-cont' in the \"objc\" style." | 967 | `objc-method-call-cont' in the \"objc\" style." |
| 968 | :type 'integer | 968 | :type 'integer |
| 969 | :group 'c) | 969 | :group 'c) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index a79d1a2c064..0556741b65b 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -902,7 +902,7 @@ the settings present before the switch. | |||
| 902 | 9) When doing indentation of control constructs, may correct | 902 | 9) When doing indentation of control constructs, may correct |
| 903 | line-breaks/spacing between elements of the construct. | 903 | line-breaks/spacing between elements of the construct. |
| 904 | 904 | ||
| 905 | 10) Uses a linear-time algorith for indentation of regions (on Emaxen with | 905 | 10) Uses a linear-time algorithm for indentation of regions (on Emaxen with |
| 906 | capable syntax engines). | 906 | capable syntax engines). |
| 907 | 907 | ||
| 908 | 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. | 908 | 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. |
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index cb0b02ff350..009400504b2 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | ;; form. For editing Fortran 90 free format source, use `f90-mode' | 29 | ;; form. For editing Fortran 90 free format source, use `f90-mode' |
| 30 | ;; (f90.el). It is meant to support the GNU Fortran language | 30 | ;; (f90.el). It is meant to support the GNU Fortran language |
| 31 | ;; implemented by g77 (its extensions to Fortran77 and | 31 | ;; implemented by g77 (its extensions to Fortran77 and |
| 32 | ;; interpretations, e.g. of blackslash in strings). | 32 | ;; interpretations, e.g. of backslash in strings). |
| 33 | 33 | ||
| 34 | ;;; History: | 34 | ;;; History: |
| 35 | 35 | ||
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index c88727c721c..53807b8de30 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el | |||
| @@ -2217,7 +2217,7 @@ Return position where LINE begins." | |||
| 2217 | (defun gdb-mapcar* (function &rest seqs) | 2217 | (defun gdb-mapcar* (function &rest seqs) |
| 2218 | "Apply FUNCTION to each element of SEQS, and make a list of the results. | 2218 | "Apply FUNCTION to each element of SEQS, and make a list of the results. |
| 2219 | If there are several SEQS, FUNCTION is called with that many | 2219 | If there are several SEQS, FUNCTION is called with that many |
| 2220 | arugments, and mapping stops as sson as the shortest list runs | 2220 | arguments, and mapping stops as sson as the shortest list runs |
| 2221 | out." | 2221 | out." |
| 2222 | (let ((shortest (apply #'min (mapcar #'length seqs)))) | 2222 | (let ((shortest (apply #'min (mapcar #'length seqs)))) |
| 2223 | (mapcar (lambda (i) | 2223 | (mapcar (lambda (i) |
| @@ -3428,7 +3428,7 @@ breakpoints buffer." | |||
| 3428 | (error "Not recognized as break/watchpoint line"))))) | 3428 | (error "Not recognized as break/watchpoint line"))))) |
| 3429 | 3429 | ||
| 3430 | 3430 | ||
| 3431 | ;; Frames buffer. This displays a perpetually correct bactrack trace. | 3431 | ;; Frames buffer. This displays a perpetually correct backtrack trace. |
| 3432 | ;; | 3432 | ;; |
| 3433 | (def-gdb-trigger-and-handler | 3433 | (def-gdb-trigger-and-handler |
| 3434 | gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames") | 3434 | gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames") |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 543539421fe..b54b2dc5f47 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -2102,7 +2102,7 @@ extension EXTN. Normally EXTN is given as the regular expression | |||
| 2102 | massaged-args))) | 2102 | massaged-args))) |
| 2103 | 2103 | ||
| 2104 | ;; Search for an association with P, a fully qualified class name, in | 2104 | ;; Search for an association with P, a fully qualified class name, in |
| 2105 | ;; gud-jdb-class-source-alist. The asssociation gives the fully | 2105 | ;; gud-jdb-class-source-alist. The association gives the fully |
| 2106 | ;; qualified file name of the source file which produced the class. | 2106 | ;; qualified file name of the source file which produced the class. |
| 2107 | (defun gud-jdb-find-source-file (p) | 2107 | (defun gud-jdb-find-source-file (p) |
| 2108 | (cdr (assoc p gud-jdb-class-source-alist))) | 2108 | (cdr (assoc p gud-jdb-class-source-alist))) |
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index e15f765ea58..958c1bfb0cc 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el | |||
| @@ -700,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first." | |||
| 700 | 700 | ||
| 701 | 701 | ||
| 702 | (defun meta-beginning-of-defun (&optional arg) | 702 | (defun meta-beginning-of-defun (&optional arg) |
| 703 | "Move backward to beginnning of a defun in Metafont or MetaPost code. | 703 | "Move backward to beginning of a defun in Metafont or MetaPost code. |
| 704 | With numeric argument, do it that many times. | 704 | With numeric argument, do it that many times. |
| 705 | Negative arg -N means move forward to Nth following beginning of defun. | 705 | Negative arg -N means move forward to Nth following beginning of defun. |
| 706 | Returns t unless search stops due to beginning or end of buffer." | 706 | Returns t unless search stops due to beginning or end of buffer." |
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 00315856ad5..93d27042dc8 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el | |||
| @@ -151,7 +151,7 @@ | |||
| 151 | ;; (`prolog-electric-dot-full-predicate-template', defaults to t | 151 | ;; (`prolog-electric-dot-full-predicate-template', defaults to t |
| 152 | ;; since it seems quicker to me to just type those commata). A | 152 | ;; since it seems quicker to me to just type those commata). A |
| 153 | ;; trivial adaptation of a patch by Markus Triska. | 153 | ;; trivial adaptation of a patch by Markus Triska. |
| 154 | ;; o Improved the behaviour of electric if-then-else to only skip | 154 | ;; o Improved the behavior of electric if-then-else to only skip |
| 155 | ;; forward if the parenthesis/semicolon is preceded by | 155 | ;; forward if the parenthesis/semicolon is preceded by |
| 156 | ;; whitespace. Once more a trivial adaptation of a patch by | 156 | ;; whitespace. Once more a trivial adaptation of a patch by |
| 157 | ;; Markus Triska. | 157 | ;; Markus Triska. |
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 97a1c4605c2..3166abb21a7 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el | |||
| @@ -672,7 +672,7 @@ highlighted properly when you open them." | |||
| 672 | :safe 'symbolp) | 672 | :safe 'symbolp) |
| 673 | (defvaralias 'sql-dialect 'sql-product) | 673 | (defvaralias 'sql-dialect 'sql-product) |
| 674 | 674 | ||
| 675 | ;; misc customization of sql.el behaviour | 675 | ;; misc customization of sql.el behavior |
| 676 | 676 | ||
| 677 | (defcustom sql-electric-stuff nil | 677 | (defcustom sql-electric-stuff nil |
| 678 | "Treat some input as electric. | 678 | "Treat some input as electric. |
| @@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.") | |||
| 3600 | (setq has-schema (and | 3600 | (setq has-schema (and |
| 3601 | (>= (length (car names)) schema-len) | 3601 | (>= (length (car names)) schema-len) |
| 3602 | (string= schema-dot | 3602 | (string= schema-dot |
| 3603 | (downcase (substring (car names) | 3603 | (downcase (substring (car names) |
| 3604 | 0 schema-len)))) | 3604 | 0 schema-len)))) |
| 3605 | names (cdr names))) | 3605 | names (cdr names))) |
| 3606 | (unless has-schema | 3606 | (unless has-schema |
| 3607 | (sql-build-completions schema))))) | 3607 | (sql-build-completions schema))))) |
| 3608 | 3608 | ||
| 3609 | ;; Try to find the completion | 3609 | ;; Try to find the completion |
| 3610 | (cond | 3610 | (cond |
| 3611 | ((not predicate) | 3611 | ((not predicate) |
| @@ -3951,7 +3951,7 @@ is specified in the connection settings." | |||
| 3951 | ;; interactive session | 3951 | ;; interactive session |
| 3952 | (eval `(let ((sql-connection ,connection) | 3952 | (eval `(let ((sql-connection ,connection) |
| 3953 | (,param-var ',rem-params)) | 3953 | (,param-var ',rem-params)) |
| 3954 | (sql-product-interactive sql-product | 3954 | (sql-product-interactive sql-product |
| 3955 | new-name))))) | 3955 | new-name))))) |
| 3956 | 3956 | ||
| 3957 | (message "SQL Connection <%s> does not exist" connection) | 3957 | (message "SQL Connection <%s> does not exist" connection) |
| @@ -3981,16 +3981,16 @@ optionally is saved to the user's init file." | |||
| 3981 | 3981 | ||
| 3982 | (if connection | 3982 | (if connection |
| 3983 | (message "This session was started by a connection; it's already been saved.") | 3983 | (message "This session was started by a connection; it's already been saved.") |
| 3984 | 3984 | ||
| 3985 | (let ((login (sql-get-product-feature product :sqli-login)) | 3985 | (let ((login (sql-get-product-feature product :sqli-login)) |
| 3986 | (alist sql-connection-alist) | 3986 | (alist sql-connection-alist) |
| 3987 | connect) | 3987 | connect) |
| 3988 | 3988 | ||
| 3989 | ;; Remove the existing connection if the user says so | 3989 | ;; Remove the existing connection if the user says so |
| 3990 | (when (and (assoc name alist) | 3990 | (when (and (assoc name alist) |
| 3991 | (yes-or-no-p (format "Replace connection definition <%s>? " name))) | 3991 | (yes-or-no-p (format "Replace connection definition <%s>? " name))) |
| 3992 | (setq alist (assq-delete-all name alist))) | 3992 | (setq alist (assq-delete-all name alist))) |
| 3993 | 3993 | ||
| 3994 | ;; Add the new connection if it doesn't exist | 3994 | ;; Add the new connection if it doesn't exist |
| 3995 | (if (assoc name alist) | 3995 | (if (assoc name alist) |
| 3996 | (message "Connection <%s> already exists" name) | 3996 | (message "Connection <%s> already exists" name) |
| @@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this: | |||
| 4747 | (sql-redirect sqlbuf "\\t off") | 4747 | (sql-redirect sqlbuf "\\t off") |
| 4748 | (when (not (string= a "aligned")) | 4748 | (when (not (string= a "aligned")) |
| 4749 | (sql-redirect sqlbuf "\\a")) | 4749 | (sql-redirect sqlbuf "\\a")) |
| 4750 | 4750 | ||
| 4751 | ;; Return the list of table names (public schema name can be omitted) | 4751 | ;; Return the list of table names (public schema name can be omitted) |
| 4752 | (mapcar (lambda (tbl) | 4752 | (mapcar (lambda (tbl) |
| 4753 | (if (string= (car tbl) "public") | 4753 | (if (string= (car tbl) "public") |
| 4754 | (cadr tbl) | 4754 | (cadr tbl) |
diff --git a/lisp/simple.el b/lisp/simple.el index 90d22c817b0..82d82bc7240 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -2657,7 +2657,7 @@ value passed." | |||
| 2657 | Per default, this variable is always set to `t', meaning that a | 2657 | Per default, this variable is always set to `t', meaning that a |
| 2658 | call of `process-file' could potentially change any file on a | 2658 | call of `process-file' could potentially change any file on a |
| 2659 | remote host. When set to `nil', a file handler could optimize | 2659 | remote host. When set to `nil', a file handler could optimize |
| 2660 | its behaviour with respect to remote file attributes caching. | 2660 | its behavior with respect to remote file attributes caching. |
| 2661 | 2661 | ||
| 2662 | This variable should never be changed by `setq'. Instead of, it | 2662 | This variable should never be changed by `setq'. Instead of, it |
| 2663 | shall be set only by let-binding.") | 2663 | shall be set only by let-binding.") |
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index cfa406c2b48..ff528fcc9df 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -142,7 +142,7 @@ This information is useful, but it takes screen space away from file names." | |||
| 142 | 142 | ||
| 143 | ;; The Tar data is made up of bytes and better manipulated as bytes | 143 | ;; The Tar data is made up of bytes and better manipulated as bytes |
| 144 | ;; and can be very large, so insert/delete can be costly. The summary we | 144 | ;; and can be very large, so insert/delete can be costly. The summary we |
| 145 | ;; want to display may contain non-ascci chars, of course, so we'd like it | 145 | ;; want to display may contain non-ascii chars, of course, so we'd like it |
| 146 | ;; to be multibyte. We used to keep both in the same buffer and switch | 146 | ;; to be multibyte. We used to keep both in the same buffer and switch |
| 147 | ;; from/to uni/multibyte. But this had several downsides: | 147 | ;; from/to uni/multibyte. But this had several downsides: |
| 148 | ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered | 148 | ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered |
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index be14e90e000..20d9c18c43e 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el | |||
| @@ -2263,7 +2263,7 @@ Returns a DIRECTION, a number 0--7, coded as follows: | |||
| 2263 | 2263 | ||
| 2264 | 2264 | ||
| 2265 | ;; Things for drawing lines in all directions. | 2265 | ;; Things for drawing lines in all directions. |
| 2266 | ;; The line drawing engine is the eight-point alrogithm. | 2266 | ;; The line drawing engine is the eight-point algorithm. |
| 2267 | ;; | 2267 | ;; |
| 2268 | ;; A line is here a list of (x y saved-char new-char)s. | 2268 | ;; A line is here a list of (x y saved-char new-char)s. |
| 2269 | ;; | 2269 | ;; |
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index 4d6b5e5fb83..1a0f7ec5836 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el | |||
| @@ -711,7 +711,7 @@ of master file." | |||
| 711 | context) | 711 | context) |
| 712 | (when (and (not appendix) | 712 | (when (and (not appendix) |
| 713 | (>= (string-to-char (match-string 2)) ?A)) | 713 | (>= (string-to-char (match-string 2)) ?A)) |
| 714 | ;; Just entered the appendex. Get out. | 714 | ;; Just entered the appendix. Get out. |
| 715 | (throw 'exit nil)) | 715 | (throw 'exit nil)) |
| 716 | 716 | ||
| 717 | ;; Change the section number. | 717 | ;; Change the section number. |
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 37983d17931..dbed09c9ccb 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | (defvar reftex-toc-mode-map | 34 | (defvar reftex-toc-mode-map |
| 35 | (let ((map (make-sparse-keymap))) | 35 | (let ((map (make-sparse-keymap))) |
| 36 | 36 | ||
| 37 | (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)]) | 37 | (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)]) |
| 38 | 'reftex-toc-mouse-goto-line-and-hide) | 38 | 'reftex-toc-mouse-goto-line-and-hide) |
| 39 | (define-key map [follow-link] 'mouse-face) | 39 | (define-key map [follow-link] 'mouse-face) |
| @@ -660,7 +660,7 @@ point." | |||
| 660 | (setq msg | 660 | (setq msg |
| 661 | (catch 'exit | 661 | (catch 'exit |
| 662 | (if (reftex-region-active-p) | 662 | (if (reftex-region-active-p) |
| 663 | ;; A region is dangerous, check if we have a brandnew scan, | 663 | ;; A region is dangerous, check if we have a brand new scan, |
| 664 | ;; to make sure we are not missing any section statements. | 664 | ;; to make sure we are not missing any section statements. |
| 665 | (if (not (reftex-toc-check-docstruct)) | 665 | (if (not (reftex-toc-check-docstruct)) |
| 666 | (reftex-toc-load-all-files-for-promotion) ;; exits | 666 | (reftex-toc-load-all-files-for-promotion) ;; exits |
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index cef8a3d1548..3ac0aa0f65d 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -1568,7 +1568,7 @@ Valid actions are: readable, restore, read, kill, write." | |||
| 1568 | ;;; Finding files | 1568 | ;;; Finding files |
| 1569 | 1569 | ||
| 1570 | (defun reftex-locate-file (file type master-dir &optional die) | 1570 | (defun reftex-locate-file (file type master-dir &optional die) |
| 1571 | "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE. | 1571 | "Find FILE of type TYPE in MASTER-DIR or on the path associated with TYPE. |
| 1572 | If the file does not have any of the valid extensions for TYPE, | 1572 | If the file does not have any of the valid extensions for TYPE, |
| 1573 | try first the default extension and only then the naked file name. | 1573 | try first the default extension and only then the naked file name. |
| 1574 | When DIE is non-nil, throw an error if file not found." | 1574 | When DIE is non-nil, throw an error if file not found." |
| @@ -2254,7 +2254,7 @@ IGNORE-WORDS List of words which should be removed from the string." | |||
| 2254 | (defvar font-lock-defaults-computed) | 2254 | (defvar font-lock-defaults-computed) |
| 2255 | (defun reftex-fontify-select-label-buffer (parent-buffer) | 2255 | (defun reftex-fontify-select-label-buffer (parent-buffer) |
| 2256 | ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to | 2256 | ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to |
| 2257 | ;; start with none-SPC char, beacuse Font-Lock otherwise refuses operation. | 2257 | ;; start with none-SPC char, because Font-Lock otherwise refuses operation. |
| 2258 | (run-hook-with-args 'reftex-pre-refontification-functions | 2258 | (run-hook-with-args 'reftex-pre-refontification-functions |
| 2259 | parent-buffer 'reftex-ref) | 2259 | parent-buffer 'reftex-ref) |
| 2260 | (let* ((oldname (buffer-name)) | 2260 | (let* ((oldname (buffer-name)) |
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 1923ab692d8..07a4fae9c30 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el | |||
| @@ -113,7 +113,7 @@ | |||
| 113 | ;; - Allowing particular views of the initially amorphous data pool | 113 | ;; - Allowing particular views of the initially amorphous data pool |
| 114 | ;; (ala the Xanadu concept). | 114 | ;; (ala the Xanadu concept). |
| 115 | ;; | 115 | ;; |
| 116 | ;; - Storage of the data in a manner most appopriate to that data, | 116 | ;; - Storage of the data in a manner most appropriate to that data, |
| 117 | ;; such as keeping address-book type information in BBDB, etc. | 117 | ;; such as keeping address-book type information in BBDB, etc. |
| 118 | ;; | 118 | ;; |
| 119 | ;; * Using "remember" | 119 | ;; * Using "remember" |
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 0ce71c25ad7..d66b297bd2b 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el | |||
| @@ -2475,7 +2475,7 @@ first of a paragraph." | |||
| 2475 | ;;------------------------------------------------------------------------------ | 2475 | ;;------------------------------------------------------------------------------ |
| 2476 | 2476 | ||
| 2477 | ;; FIXME: these next functions should become part of a larger effort to redo the | 2477 | ;; FIXME: these next functions should become part of a larger effort to redo the |
| 2478 | ;; bullets in bulletted lists. The enumerate would just be one of the possible | 2478 | ;; bullets in bulleted lists. The enumerate would just be one of the possible |
| 2479 | ;; outputs. | 2479 | ;; outputs. |
| 2480 | ;; | 2480 | ;; |
| 2481 | ;; FIXME: TODO we need to do the enumeration removal as well. | 2481 | ;; FIXME: TODO we need to do the enumeration removal as well. |
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 5a7fa0bf950..9bf75fa7f55 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el | |||
| @@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer." | |||
| 1127 | 1127 | ||
| 1128 | ;; Revise the mode line to display which difference we have selected | 1128 | ;; Revise the mode line to display which difference we have selected |
| 1129 | ;; Also resets modelines of buffers A/B, since they may be clobbered by | 1129 | ;; Also resets modelines of buffers A/B, since they may be clobbered by |
| 1130 | ;; anothe invocations of Ediff. | 1130 | ;; other invocations of Ediff. |
| 1131 | (defun ediff-refresh-mode-lines () | 1131 | (defun ediff-refresh-mode-lines () |
| 1132 | (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) | 1132 | (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) |
| 1133 | 1133 | ||
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8051009a983..39c583b8a0d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el | |||
| @@ -1399,7 +1399,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." | |||
| 1399 | ;; `incg' or `buffer-substring-no-properties'. (This is | 1399 | ;; `incg' or `buffer-substring-no-properties'. (This is |
| 1400 | ;; for speed; strictly speaking, it is sufficient to use | 1400 | ;; for speed; strictly speaking, it is sufficient to use |
| 1401 | ;; only the former since it behaves identically to the | 1401 | ;; only the former since it behaves identically to the |
| 1402 | ;; latter in the absense of "@@".) | 1402 | ;; latter in the absence of "@@".) |
| 1403 | sub) | 1403 | sub) |
| 1404 | (flet ((incg (beg end) (let ((b beg) (e end) @-holes) | 1404 | (flet ((incg (beg end) (let ((b beg) (e end) @-holes) |
| 1405 | (while (and asc (< (car asc) e)) | 1405 | (while (and asc (< (car asc) e)) |
diff --git a/lisp/whitespace.el b/lisp/whitespace.el index f50386b1827..dde85478f7e 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el | |||
| @@ -2573,7 +2573,7 @@ Also refontify when necessary." | |||
| 2573 | (setq whitespace-display-table-was-local t | 2573 | (setq whitespace-display-table-was-local t |
| 2574 | whitespace-display-table | 2574 | whitespace-display-table |
| 2575 | (copy-sequence buffer-display-table)) | 2575 | (copy-sequence buffer-display-table)) |
| 2576 | ;; asure `buffer-display-table' is unique | 2576 | ;; Assure `buffer-display-table' is unique |
| 2577 | ;; when two or more windows are visible. | 2577 | ;; when two or more windows are visible. |
| 2578 | (setq buffer-display-table | 2578 | (setq buffer-display-table |
| 2579 | (copy-sequence buffer-display-table))) | 2579 | (copy-sequence buffer-display-table))) |
diff --git a/lisp/windmove.el b/lisp/windmove.el index 2aef37dd4c8..1deaa44c7dd 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el | |||
| @@ -245,7 +245,7 @@ placement bugs in old versions of Emacs." | |||
| 245 | ;; Actually, the whole subject of the minibuffer edge of the frame is | 245 | ;; Actually, the whole subject of the minibuffer edge of the frame is |
| 246 | ;; rather messy. It turns out that with a sufficiently large delta, | 246 | ;; rather messy. It turns out that with a sufficiently large delta, |
| 247 | ;; we can fly off the bottom edge of the frame and miss the minibuffer | 247 | ;; we can fly off the bottom edge of the frame and miss the minibuffer |
| 248 | ;; altogther. This, I think, is never right: if there's a minibuffer | 248 | ;; altogether. This, I think, is never right: if there's a minibuffer |
| 249 | ;; and you're not in it, and you move down, the minibuffer should be | 249 | ;; and you're not in it, and you move down, the minibuffer should be |
| 250 | ;; in your way. | 250 | ;; in your way. |
| 251 | ;; | 251 | ;; |
diff --git a/lisp/xml.el b/lisp/xml.el index 52bb0de7ea0..68aa5f4db6f 100644 --- a/lisp/xml.el +++ b/lisp/xml.el | |||
| @@ -540,7 +540,7 @@ Leave point at the first non-blank character after the tag." | |||
| 540 | (replace-regexp-in-string "\\s-\\{2,\\}" " " string) | 540 | (replace-regexp-in-string "\\s-\\{2,\\}" " " string) |
| 541 | (let ((expansion (xml-substitute-special string))) | 541 | (let ((expansion (xml-substitute-special string))) |
| 542 | (unless (stringp expansion) | 542 | (unless (stringp expansion) |
| 543 | ; We say this is the constraint. It is acctually that | 543 | ; We say this is the constraint. It is actually that neither |
| 544 | ; external entities nor "<" can be in an attribute value. | 544 | ; external entities nor "<" can be in an attribute value. |
| 545 | (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements")) | 545 | (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements")) |
| 546 | (push (cons name expansion) attlist))) | 546 | (push (cons name expansion) attlist))) |
diff --git a/src/alloc.c b/src/alloc.c index 985e4b71426..1d274e2111e 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -882,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg) | |||
| 882 | 882 | ||
| 883 | /* Like malloc but used for allocating Lisp data. NBYTES is the | 883 | /* Like malloc but used for allocating Lisp data. NBYTES is the |
| 884 | number of bytes to allocate, TYPE describes the intended use of the | 884 | number of bytes to allocate, TYPE describes the intended use of the |
| 885 | allcated memory block (for strings, for conses, ...). */ | 885 | allocated memory block (for strings, for conses, ...). */ |
| 886 | 886 | ||
| 887 | #ifndef USE_LSB_TAG | 887 | #ifndef USE_LSB_TAG |
| 888 | static void *lisp_malloc_loser; | 888 | static void *lisp_malloc_loser; |
diff --git a/src/bytecode.c b/src/bytecode.c index 91d360bec1b..3af0abd63cf 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -271,7 +271,7 @@ struct byte_stack | |||
| 271 | /* A list of currently active byte-code execution value stacks. | 271 | /* A list of currently active byte-code execution value stacks. |
| 272 | Fbyte_code adds an entry to the head of this list before it starts | 272 | Fbyte_code adds an entry to the head of this list before it starts |
| 273 | processing byte-code, and it removed the entry again when it is | 273 | processing byte-code, and it removed the entry again when it is |
| 274 | done. Signaling an error truncates the list analoguous to | 274 | done. Signaling an error truncates the list analogous to |
| 275 | gcprolist. */ | 275 | gcprolist. */ |
| 276 | 276 | ||
| 277 | struct byte_stack *byte_stack_list; | 277 | struct byte_stack *byte_stack_list; |
diff --git a/src/coding.h b/src/coding.h index fdf9b762e75..2621928adc3 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -518,7 +518,7 @@ struct coding_system | |||
| 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 | 518 | #define CODING_REQUIRE_DETECTION_MASK 0x1000 |
| 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 | 519 | #define CODING_RESET_AT_BOL_MASK 0x2000 |
| 520 | 520 | ||
| 521 | /* Return 1 if the coding context CODING requires annotaion | 521 | /* Return 1 if the coding context CODING requires annotation |
| 522 | handling. */ | 522 | handling. */ |
| 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ | 523 | #define CODING_REQUIRE_ANNOTATION(coding) \ |
| 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) | 524 | ((coding)->common_flags & CODING_ANNOTATION_MASK) |
diff --git a/src/emacs.c b/src/emacs.c index 12be7bc0808..529fa35a5bd 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem | |||
| 1402 | #endif | 1402 | #endif |
| 1403 | 1403 | ||
| 1404 | /* argmatch must not be used after here, | 1404 | /* argmatch must not be used after here, |
| 1405 | except when bulding temacs | 1405 | except when building temacs |
| 1406 | because the -d argument has not been skipped in skip_args. */ | 1406 | because the -d argument has not been skipped in skip_args. */ |
| 1407 | 1407 | ||
| 1408 | #ifdef MSDOS | 1408 | #ifdef MSDOS |
diff --git a/src/font.c b/src/font.c index ead8225471e..3fc5fc944b4 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -5144,7 +5144,7 @@ the corresponding glyph code. If ENCODING is a char-table, looking up | |||
| 5144 | the table by a character gives the corresponding glyph code. | 5144 | the table by a character gives the corresponding glyph code. |
| 5145 | 5145 | ||
| 5146 | REPERTORY specifies a repertory of characters supported by the font. | 5146 | REPERTORY specifies a repertory of characters supported by the font. |
| 5147 | If REPERTORY is a charset, all characters beloging to the charset are | 5147 | If REPERTORY is a charset, all characters belonging to the charset are |
| 5148 | supported. If REPERTORY is a char-table, all characters who have a | 5148 | supported. If REPERTORY is a char-table, all characters who have a |
| 5149 | non-nil value in the table are supported. If REPERTORY is nil, Emacs | 5149 | non-nil value in the table are supported. If REPERTORY is nil, Emacs |
| 5150 | gets the repertory information by an opened font and ENCODING. */); | 5150 | gets the repertory information by an opened font and ENCODING. */); |
diff --git a/src/image.c b/src/image.c index 1869b83ac2a..8b64bdf20b0 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -8781,7 +8781,7 @@ syms_of_image (void) | |||
| 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ | 8781 | operation on GNU/Linux of calling dump-emacs after loading some images. */ |
| 8782 | image_types = NULL; | 8782 | image_types = NULL; |
| 8783 | 8783 | ||
| 8784 | /* Must be defined now becase we're going to update it below, while | 8784 | /* Must be defined now because we're going to update it below, while |
| 8785 | defining the supported image types. */ | 8785 | defining the supported image types. */ |
| 8786 | DEFVAR_LISP ("image-types", Vimage_types, | 8786 | DEFVAR_LISP ("image-types", Vimage_types, |
| 8787 | doc: /* List of potentially supported image types. | 8787 | doc: /* List of potentially supported image types. |
diff --git a/src/indent.c b/src/indent.c index a70b7971b96..07a54c0c1b7 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -1675,7 +1675,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ | |||
| 1675 | val_compute_motion.prevhpos = contin_hpos; | 1675 | val_compute_motion.prevhpos = contin_hpos; |
| 1676 | else | 1676 | else |
| 1677 | val_compute_motion.prevhpos = prev_hpos; | 1677 | val_compute_motion.prevhpos = prev_hpos; |
| 1678 | /* We alalways handle all of them here; none of them remain to do. */ | 1678 | /* We always handle all of them here; none of them remain to do. */ |
| 1679 | val_compute_motion.ovstring_chars_done = 0; | 1679 | val_compute_motion.ovstring_chars_done = 0; |
| 1680 | 1680 | ||
| 1681 | /* Nonzero if have just continued a line */ | 1681 | /* Nonzero if have just continued a line */ |
diff --git a/src/keyboard.c b/src/keyboard.c index fb989d3ea95..87dd2b0e251 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1060,7 +1060,7 @@ cmd_error_internal (Lisp_Object data, const char *context) | |||
| 1060 | struct frame *sf = SELECTED_FRAME (); | 1060 | struct frame *sf = SELECTED_FRAME (); |
| 1061 | 1061 | ||
| 1062 | /* The immediate context is not interesting for Quits, | 1062 | /* The immediate context is not interesting for Quits, |
| 1063 | since they are asyncronous. */ | 1063 | since they are asynchronous. */ |
| 1064 | if (EQ (XCAR (data), Qquit)) | 1064 | if (EQ (XCAR (data), Qquit)) |
| 1065 | Vsignaling_function = Qnil; | 1065 | Vsignaling_function = Qnil; |
| 1066 | 1066 | ||
diff --git a/src/nsterm.m b/src/nsterm.m index 3d3723fc28c..7d26cba6d73 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -3035,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) | |||
| 3035 | /* Currently on NS img->mask is always 0. Since | 3035 | /* Currently on NS img->mask is always 0. Since |
| 3036 | get_window_cursor_type specifies a hollow box cursor when on | 3036 | get_window_cursor_type specifies a hollow box cursor when on |
| 3037 | a non-masked image we never reach this clause. But we put it | 3037 | a non-masked image we never reach this clause. But we put it |
| 3038 | in in antipication of better support for image masks on | 3038 | in in anticipation of better support for image masks on |
| 3039 | NS. */ | 3039 | NS. */ |
| 3040 | tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); | 3040 | tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); |
| 3041 | } | 3041 | } |
diff --git a/src/sound.c b/src/sound.c index 362c04b7d40..39007574afc 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -226,7 +226,7 @@ struct sound_device | |||
| 226 | /* Close device SD. */ | 226 | /* Close device SD. */ |
| 227 | void (* close) (struct sound_device *sd); | 227 | void (* close) (struct sound_device *sd); |
| 228 | 228 | ||
| 229 | /* Configure SD accoring to device-dependent parameters. */ | 229 | /* Configure SD according to device-dependent parameters. */ |
| 230 | void (* configure) (struct sound_device *device); | 230 | void (* configure) (struct sound_device *device); |
| 231 | 231 | ||
| 232 | /* Choose a device-dependent format for outputting sound S. */ | 232 | /* Choose a device-dependent format for outputting sound S. */ |
diff --git a/src/w32fns.c b/src/w32fns.c index ffbcff86694..b4166cbf691 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key) | |||
| 2088 | key_mapping = Qnil; | 2088 | key_mapping = Qnil; |
| 2089 | } | 2089 | } |
| 2090 | 2090 | ||
| 2091 | /* NB. This code runs in the input thread, asychronously to the lisp | 2091 | /* NB. This code runs in the input thread, asynchronously to the lisp |
| 2092 | thread, so we must be careful to ensure access to lisp data is | 2092 | thread, so we must be careful to ensure access to lisp data is |
| 2093 | thread-safe. The following code is safe because the modifier | 2093 | thread-safe. The following code is safe because the modifier |
| 2094 | variable values are updated atomically from lisp and symbols are | 2094 | variable values are updated atomically from lisp and symbols are |
diff --git a/src/w32font.c b/src/w32font.c index 365f8b78a5e..2088af2fbe7 100644 --- a/src/w32font.c +++ b/src/w32font.c | |||
| @@ -1492,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name) | |||
| 1492 | 1492 | ||
| 1493 | 1493 | ||
| 1494 | /* Callback function for EnumFontFamiliesEx. | 1494 | /* Callback function for EnumFontFamiliesEx. |
| 1495 | * Checks if a font matches everything we are trying to check agaist, | 1495 | * Checks if a font matches everything we are trying to check against, |
| 1496 | * and if so, adds it to a list. Both the data we are checking against | 1496 | * and if so, adds it to a list. Both the data we are checking against |
| 1497 | * and the list to which the fonts are added are passed in via the | 1497 | * and the list to which the fonts are added are passed in via the |
| 1498 | * lparam argument, in the form of a font_callback_data struct. */ | 1498 | * lparam argument, in the form of a font_callback_data struct. */ |
diff --git a/src/w32menu.c b/src/w32menu.c index c31a8c1fd96..39d101e7bd5 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) | |||
| 1443 | out_string = (char *) local_alloc (strlen (wv->name) + 1); | 1443 | out_string = (char *) local_alloc (strlen (wv->name) + 1); |
| 1444 | strcpy (out_string, wv->name); | 1444 | strcpy (out_string, wv->name); |
| 1445 | #ifdef MENU_DEBUG | 1445 | #ifdef MENU_DEBUG |
| 1446 | DebPrint ("Menu: allocing %ld for owner-draw", out_string); | 1446 | DebPrint ("Menu: allocating %ld for owner-draw", out_string); |
| 1447 | #endif | 1447 | #endif |
| 1448 | fuFlags = MF_OWNERDRAW | MF_DISABLED; | 1448 | fuFlags = MF_OWNERDRAW | MF_DISABLED; |
| 1449 | } | 1449 | } |
diff --git a/src/w32term.c b/src/w32term.c index e2a06446976..e9fa16ba325 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -5691,7 +5691,7 @@ x_make_frame_visible (struct frame *f) | |||
| 5691 | f->output_data.w32->asked_for_visible = 1; | 5691 | f->output_data.w32->asked_for_visible = 1; |
| 5692 | 5692 | ||
| 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL | 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL |
| 5694 | causes unexpected behaviour when unminimizing frames that were | 5694 | causes unexpected behavior when unminimizing frames that were |
| 5695 | previously maximised. But only SW_SHOWNORMAL works properly for | 5695 | previously maximised. But only SW_SHOWNORMAL works properly for |
| 5696 | frames that were truely hidden (using make-frame-invisible), so | 5696 | frames that were truely hidden (using make-frame-invisible), so |
| 5697 | we need it to avoid Bug#5482. It seems that async_iconified | 5697 | we need it to avoid Bug#5482. It seems that async_iconified |
diff --git a/test/indent/octave.m b/test/indent/octave.m index 768f3d85e01..5ce52ad7a19 100644 --- a/test/indent/octave.m +++ b/test/indent/octave.m | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | function res = tcomp (fn) | 3 | function res = tcomp (fn) |
| 4 | %% res = tcomp (fn) | 4 | %% res = tcomp (fn) |
| 5 | %% imports components and rearranges them. | 5 | %% imports components and rearranges them. |
| 6 | 6 | ||
| 7 | if nargin ~= 1 | 7 | if nargin ~= 1 |
| 8 | print_usage() | 8 | print_usage() |
| 9 | end | 9 | end |
| @@ -36,7 +36,7 @@ function res = tcomp (fn) | |||
| 36 | endfunction | 36 | endfunction |
| 37 | 37 | ||
| 38 | ## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg | 38 | ## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg |
| 39 | ## | 39 | ## |
| 40 | ## This file is part of Octave. | 40 | ## This file is part of Octave. |
| 41 | ## | 41 | ## |
| 42 | ## Octave is free software; you can redistribute it and/or modify it | 42 | ## Octave is free software; you can redistribute it and/or modify it |
| @@ -73,16 +73,16 @@ endfunction | |||
| 73 | ## | 73 | ## |
| 74 | ## @table @code | 74 | ## @table @code |
| 75 | ## @item -nodeps | 75 | ## @item -nodeps |
| 76 | ## The package manager will disable the dependency checking. That way it | 76 | ## The package manager will disable the dependency checking. That way it |
| 77 | ## is possible to install a package even if it depends on another package | 77 | ## is possible to install a package even if it depends on another package |
| 78 | ## that's not installed on the system. @strong{Use this option with care.} | 78 | ## that's not installed on the system. @strong{Use this option with care.} |
| 79 | ## | 79 | ## |
| 80 | ## @item -noauto | 80 | ## @item -noauto |
| 81 | ## The package manager will not automatically load the installed package | 81 | ## The package manager will not automatically load the installed package |
| 82 | ## when starting Octave, even if the package requests that it is. | 82 | ## when starting Octave, even if the package requests that it is. |
| 83 | ## | 83 | ## |
| 84 | ## @item -auto | 84 | ## @item -auto |
| 85 | ## The package manager will automatically load the installed package when | 85 | ## The package manager will automatically load the installed package when |
| 86 | ## starting Octave, even if the package requests that it isn't. | 86 | ## starting Octave, even if the package requests that it isn't. |
| 87 | ## | 87 | ## |
| 88 | ## @item -local | 88 | ## @item -local |
| @@ -93,7 +93,7 @@ endfunction | |||
| 93 | ## system privileges | 93 | ## system privileges |
| 94 | ## | 94 | ## |
| 95 | ## @item -verbose | 95 | ## @item -verbose |
| 96 | ## The package manager will print the output of all of the commands that are | 96 | ## The package manager will print the output of all of the commands that are |
| 97 | ## performed. | 97 | ## performed. |
| 98 | ## @end table | 98 | ## @end table |
| 99 | ## | 99 | ## |
| @@ -205,7 +205,7 @@ endfunction | |||
| 205 | ## pkg global_list | 205 | ## pkg global_list |
| 206 | ## @end example | 206 | ## @end example |
| 207 | ## @item rebuild | 207 | ## @item rebuild |
| 208 | ## Rebuilds the package database from the installed directories. This can | 208 | ## Rebuilds the package database from the installed directories. This can |
| 209 | ## be used in cases where for some reason the package database is corrupted. | 209 | ## be used in cases where for some reason the package database is corrupted. |
| 210 | ## It can also take the @code{-auto} and @code{-noauto} options to allow the | 210 | ## It can also take the @code{-auto} and @code{-noauto} options to allow the |
| 211 | ## autoloading state of a package to be changed. For example | 211 | ## autoloading state of a package to be changed. For example |
| @@ -227,7 +227,7 @@ endfunction | |||
| 227 | ## @noindent | 227 | ## @noindent |
| 228 | ## where @code{builddir} is the name of a directory where the temporary | 228 | ## where @code{builddir} is the name of a directory where the temporary |
| 229 | ## installation will be produced and the binary packages will be found. | 229 | ## installation will be produced and the binary packages will be found. |
| 230 | ## The options @code{-verbose} and @code{-nodeps} are respected, while | 230 | ## The options @code{-verbose} and @code{-nodeps} are respected, while |
| 231 | ## the other options are ignored. | 231 | ## the other options are ignored. |
| 232 | ## @end table | 232 | ## @end table |
| 233 | ## @end deftypefn | 233 | ## @end deftypefn |
| @@ -259,7 +259,7 @@ function [local_packages, global_packages] = pkg (varargin) | |||
| 259 | 259 | ||
| 260 | available_actions = {"list", "install", "uninstall", "load", ... | 260 | available_actions = {"list", "install", "uninstall", "load", ... |
| 261 | "unload", "prefix", "local_list", ... | 261 | "unload", "prefix", "local_list", ... |
| 262 | "global_list", "rebuild", "build","describe"}; | 262 | "global_list", "rebuild", "build","describe"}; |
| 263 | ## Handle input | 263 | ## Handle input |
| 264 | if (length (varargin) == 0 || ! iscellstr (varargin)) | 264 | if (length (varargin) == 0 || ! iscellstr (varargin)) |
| 265 | print_usage (); | 265 | print_usage (); |
| @@ -321,14 +321,14 @@ function [local_packages, global_packages] = pkg (varargin) | |||
| 321 | if (length (files) == 0) | 321 | if (length (files) == 0) |
| 322 | error ("you must specify at least one filename when calling 'pkg install'"); | 322 | error ("you must specify at least one filename when calling 'pkg install'"); |
| 323 | endif | 323 | endif |
| 324 | install (files, deps, auto, prefix, archprefix, verbose, local_list, | 324 | install (files, deps, auto, prefix, archprefix, verbose, local_list, |
| 325 | global_list, global_install); | 325 | global_list, global_install); |
| 326 | 326 | ||
| 327 | case "uninstall" | 327 | case "uninstall" |
| 328 | if (length (files) == 0) | 328 | if (length (files) == 0) |
| 329 | error ("you must specify at least one package when calling 'pkg uninstall'"); | 329 | error ("you must specify at least one package when calling 'pkg uninstall'"); |
| 330 | endif | 330 | endif |
| 331 | uninstall (files, deps, verbose, local_list, | 331 | uninstall (files, deps, verbose, local_list, |
| 332 | global_list, global_install); | 332 | global_list, global_install); |
| 333 | 333 | ||
| 334 | case "load" | 334 | case "load" |
| @@ -406,7 +406,7 @@ function [local_packages, global_packages] = pkg (varargin) | |||
| 406 | 406 | ||
| 407 | case "rebuild" | 407 | case "rebuild" |
| 408 | if (global_install) | 408 | if (global_install) |
| 409 | global_packages = rebuild (prefix, archprefix, global_list, files, | 409 | global_packages = rebuild (prefix, archprefix, global_list, files, |
| 410 | auto, verbose); | 410 | auto, verbose); |
| 411 | global_packages = save_order (global_packages); | 411 | global_packages = save_order (global_packages); |
| 412 | save (global_list, "global_packages"); | 412 | save (global_list, "global_packages"); |
| @@ -414,7 +414,7 @@ function [local_packages, global_packages] = pkg (varargin) | |||
| 414 | local_packages = global_packages; | 414 | local_packages = global_packages; |
| 415 | endif | 415 | endif |
| 416 | else | 416 | else |
| 417 | local_packages = rebuild (prefix, archprefix, local_list, files, auto, | 417 | local_packages = rebuild (prefix, archprefix, local_list, files, auto, |
| 418 | verbose); | 418 | verbose); |
| 419 | local_packages = save_order (local_packages); | 419 | local_packages = save_order (local_packages); |
| 420 | save (local_list, "local_packages"); | 420 | save (local_list, "local_packages"); |
| @@ -450,7 +450,7 @@ function [local_packages, global_packages] = pkg (varargin) | |||
| 450 | otherwise | 450 | otherwise |
| 451 | error ("you can request at most two outputs when calling 'pkg describe'"); | 451 | error ("you can request at most two outputs when calling 'pkg describe'"); |
| 452 | endswitch | 452 | endswitch |
| 453 | 453 | ||
| 454 | otherwise | 454 | otherwise |
| 455 | error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); | 455 | error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); |
| 456 | endswitch | 456 | endswitch |
| @@ -529,7 +529,7 @@ function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose) | |||
| 529 | endfor | 529 | endfor |
| 530 | if (! isempty (dup)) | 530 | if (! isempty (dup)) |
| 531 | descriptions (dup) = []; | 531 | descriptions (dup) = []; |
| 532 | endif | 532 | endif |
| 533 | endif | 533 | endif |
| 534 | endfunction | 534 | endfunction |
| 535 | 535 | ||
| @@ -555,7 +555,7 @@ function build (files, handle_deps, autoload, verbose) | |||
| 555 | endif | 555 | endif |
| 556 | files(1) = []; | 556 | files(1) = []; |
| 557 | buildlist = fullfile (builddir, "octave_packages"); | 557 | buildlist = fullfile (builddir, "octave_packages"); |
| 558 | install (files, handle_deps, autoload, installdir, installdir, verbose, | 558 | install (files, handle_deps, autoload, installdir, installdir, verbose, |
| 559 | buildlist, "", false); | 559 | buildlist, "", false); |
| 560 | unwind_protect | 560 | unwind_protect |
| 561 | repackage (builddir, buildlist); | 561 | repackage (builddir, buildlist); |
| @@ -570,7 +570,7 @@ function build (files, handle_deps, autoload, verbose) | |||
| 570 | end_unwind_protect | 570 | end_unwind_protect |
| 571 | endfunction | 571 | endfunction |
| 572 | 572 | ||
| 573 | function install (files, handle_deps, autoload, prefix, archprefix, verbose, | 573 | function install (files, handle_deps, autoload, prefix, archprefix, verbose, |
| 574 | local_list, global_list, global_install) | 574 | local_list, global_list, global_install) |
| 575 | 575 | ||
| 576 | ## Check that the directory in prefix exist. If it doesn't: create it! | 576 | ## Check that the directory in prefix exist. If it doesn't: create it! |
| @@ -583,10 +583,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 583 | endif | 583 | endif |
| 584 | 584 | ||
| 585 | ## Get the list of installed packages. | 585 | ## Get the list of installed packages. |
| 586 | [local_packages, global_packages] = installed_packages (local_list, | 586 | [local_packages, global_packages] = installed_packages (local_list, |
| 587 | global_list); | 587 | global_list); |
| 588 | 588 | ||
| 589 | installed_pkgs_lst = {local_packages{:}, global_packages{:}}; | 589 | installed_pkgs_lst = {local_packages{:}, global_packages{:}}; |
| 590 | 590 | ||
| 591 | if (global_install) | 591 | if (global_install) |
| 592 | packages = global_packages; | 592 | packages = global_packages; |
| @@ -599,7 +599,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 599 | try | 599 | try |
| 600 | ## Warn about non existent files. | 600 | ## Warn about non existent files. |
| 601 | for i = 1:length (files) | 601 | for i = 1:length (files) |
| 602 | if (isempty (glob(files{i}))) | 602 | if (isempty (glob(files{i}))) |
| 603 | warning ("file %s does not exist", files{i}); | 603 | warning ("file %s does not exist", files{i}); |
| 604 | endif | 604 | endif |
| 605 | endfor | 605 | endfor |
| @@ -652,32 +652,32 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 652 | packdir = fullfile (pwd(), dirlist{3}); | 652 | packdir = fullfile (pwd(), dirlist{3}); |
| 653 | endif | 653 | endif |
| 654 | packdirs{end+1} = packdir; | 654 | packdirs{end+1} = packdir; |
| 655 | 655 | ||
| 656 | ## Make sure the package contains necessary files. | 656 | ## Make sure the package contains necessary files. |
| 657 | verify_directory (packdir); | 657 | verify_directory (packdir); |
| 658 | 658 | ||
| 659 | ## Read the DESCRIPTION file. | 659 | ## Read the DESCRIPTION file. |
| 660 | filename = fullfile (packdir, "DESCRIPTION"); | 660 | filename = fullfile (packdir, "DESCRIPTION"); |
| 661 | desc = get_description (filename); | 661 | desc = get_description (filename); |
| 662 | 662 | ||
| 663 | ## Verify that package name corresponds with filename. | 663 | ## Verify that package name corresponds with filename. |
| 664 | [dummy, nm] = fileparts (tgz); | 664 | [dummy, nm] = fileparts (tgz); |
| 665 | if ((length (nm) >= length (desc.name)) | 665 | if ((length (nm) >= length (desc.name)) |
| 666 | && ! strcmp (desc.name, nm(1:length(desc.name)))) | 666 | && ! strcmp (desc.name, nm(1:length(desc.name)))) |
| 667 | error ("package name '%s' doesn't correspond to its filename '%s'", | 667 | error ("package name '%s' doesn't correspond to its filename '%s'", |
| 668 | desc.name, nm); | 668 | desc.name, nm); |
| 669 | endif | 669 | endif |
| 670 | 670 | ||
| 671 | ## Set default installation directory. | 671 | ## Set default installation directory. |
| 672 | desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); | 672 | desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); |
| 673 | 673 | ||
| 674 | ## Set default architectire dependent installation directory. | 674 | ## Set default architecture dependent installation directory. |
| 675 | desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", | 675 | desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", |
| 676 | desc.version)); | 676 | desc.version)); |
| 677 | 677 | ||
| 678 | ## Save desc. | 678 | ## Save desc. |
| 679 | descriptions{end+1} = desc; | 679 | descriptions{end+1} = desc; |
| 680 | 680 | ||
| 681 | ## Are any of the new packages already installed? | 681 | ## Are any of the new packages already installed? |
| 682 | ## If so we'll remove the old version. | 682 | ## If so we'll remove the old version. |
| 683 | for j = 1:length (packages) | 683 | for j = 1:length (packages) |
| @@ -705,14 +705,14 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 705 | if (global_install) | 705 | if (global_install) |
| 706 | ## Global installation is not allowed to have dependencies on locally | 706 | ## Global installation is not allowed to have dependencies on locally |
| 707 | ## installed packages. | 707 | ## installed packages. |
| 708 | idx1 = complement (packages_to_uninstall, | 708 | idx1 = complement (packages_to_uninstall, |
| 709 | 1:length(global_packages)); | 709 | 1:length(global_packages)); |
| 710 | pseudo_installed_packages = {global_packages{idx1}, ... | 710 | pseudo_installed_packages = {global_packages{idx1}, ... |
| 711 | descriptions{idx2}}; | 711 | descriptions{idx2}}; |
| 712 | else | 712 | else |
| 713 | idx1 = complement (packages_to_uninstall, | 713 | idx1 = complement (packages_to_uninstall, |
| 714 | 1:length(local_packages)); | 714 | 1:length(local_packages)); |
| 715 | pseudo_installed_packages = {local_packages{idx1}, ... | 715 | pseudo_installed_packages = {local_packages{idx1}, ... |
| 716 | global_packages{:}, ... | 716 | global_packages{:}, ... |
| 717 | descriptions{idx2}}; | 717 | descriptions{idx2}}; |
| 718 | endif | 718 | endif |
| @@ -755,10 +755,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 755 | try | 755 | try |
| 756 | for i = packages_to_uninstall | 756 | for i = packages_to_uninstall |
| 757 | if (global_install) | 757 | if (global_install) |
| 758 | uninstall ({global_packages{i}.name}, false, verbose, local_list, | 758 | uninstall ({global_packages{i}.name}, false, verbose, local_list, |
| 759 | global_list, global_install); | 759 | global_list, global_install); |
| 760 | else | 760 | else |
| 761 | uninstall ({local_packages{i}.name}, false, verbose, local_list, | 761 | uninstall ({local_packages{i}.name}, false, verbose, local_list, |
| 762 | global_list, global_install); | 762 | global_list, global_install); |
| 763 | endif | 763 | endif |
| 764 | endfor | 764 | endfor |
| @@ -809,7 +809,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 809 | ## requested that it is, then mark the package as autoloaded. | 809 | ## requested that it is, then mark the package as autoloaded. |
| 810 | for i = length (descriptions):-1:1 | 810 | for i = length (descriptions):-1:1 |
| 811 | if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) | 811 | if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) |
| 812 | fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", | 812 | fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", |
| 813 | ".autoload"), "wt")); | 813 | ".autoload"), "wt")); |
| 814 | descriptions{i}.autoload = 1; | 814 | descriptions{i}.autoload = 1; |
| 815 | endif | 815 | endif |
| @@ -872,10 +872,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, | |||
| 872 | endif | 872 | endif |
| 873 | endfunction | 873 | endfunction |
| 874 | 874 | ||
| 875 | function uninstall (pkgnames, handle_deps, verbose, local_list, | 875 | function uninstall (pkgnames, handle_deps, verbose, local_list, |
| 876 | global_list, global_install) | 876 | global_list, global_install) |
| 877 | ## Get the list of installed packages. | 877 | ## Get the list of installed packages. |
| 878 | [local_packages, global_packages] = installed_packages(local_list, | 878 | [local_packages, global_packages] = installed_packages(local_list, |
| 879 | global_list); | 879 | global_list); |
| 880 | if (global_install) | 880 | if (global_install) |
| 881 | installed_pkgs_lst = {local_packages{:}, global_packages{:}}; | 881 | installed_pkgs_lst = {local_packages{:}, global_packages{:}}; |
| @@ -996,13 +996,13 @@ function uninstall (pkgnames, handle_deps, verbose, local_list, | |||
| 996 | 996 | ||
| 997 | endfunction | 997 | endfunction |
| 998 | 998 | ||
| 999 | function [pkg_desc_list, flag] = describe (pkgnames, verbose, | 999 | function [pkg_desc_list, flag] = describe (pkgnames, verbose, |
| 1000 | local_list, global_list) | 1000 | local_list, global_list) |
| 1001 | 1001 | ||
| 1002 | ## Get the list of installed packages. | 1002 | ## Get the list of installed packages. |
| 1003 | installed_pkgs_lst = installed_packages(local_list, global_list); | 1003 | installed_pkgs_lst = installed_packages(local_list, global_list); |
| 1004 | num_packages = length (installed_pkgs_lst); | 1004 | num_packages = length (installed_pkgs_lst); |
| 1005 | 1005 | ||
| 1006 | 1006 | ||
| 1007 | describe_all = false; | 1007 | describe_all = false; |
| 1008 | if (any (strcmp ("all", pkgnames))) | 1008 | if (any (strcmp ("all", pkgnames))) |
| @@ -1043,7 +1043,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, | |||
| 1043 | non_inst_str = sprintf (" %s ", pkgnames{non_inst}); | 1043 | non_inst_str = sprintf (" %s ", pkgnames{non_inst}); |
| 1044 | error ("some packages are not installed: %s", non_inst_str); | 1044 | error ("some packages are not installed: %s", non_inst_str); |
| 1045 | else | 1045 | else |
| 1046 | pkg_desc_list{non_inst} = struct ("name", {}, "description", | 1046 | pkg_desc_list{non_inst} = struct ("name", {}, "description", |
| 1047 | {}, "provides", {}); | 1047 | {}, "provides", {}); |
| 1048 | endif | 1048 | endif |
| 1049 | endif | 1049 | endif |
| @@ -1052,7 +1052,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, | |||
| 1052 | for i = 1:num_pkgnames | 1052 | for i = 1:num_pkgnames |
| 1053 | print_package_description (pkg_desc_list{i}.name, | 1053 | print_package_description (pkg_desc_list{i}.name, |
| 1054 | pkg_desc_list{i}.version, | 1054 | pkg_desc_list{i}.version, |
| 1055 | pkg_desc_list{i}.provides, | 1055 | pkg_desc_list{i}.provides, |
| 1056 | pkg_desc_list{i}.description, | 1056 | pkg_desc_list{i}.description, |
| 1057 | flag{i}, verbose); | 1057 | flag{i}, verbose); |
| 1058 | endfor | 1058 | endfor |
| @@ -1069,12 +1069,12 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) | |||
| 1069 | 1069 | ||
| 1070 | if (! exist (index_file, "file")) | 1070 | if (! exist (index_file, "file")) |
| 1071 | error ("could not find any INDEX file in directory %s, try 'pkg rebuild all' to generate missing INDEX files", packdir); | 1071 | error ("could not find any INDEX file in directory %s, try 'pkg rebuild all' to generate missing INDEX files", packdir); |
| 1072 | endif | 1072 | endif |
| 1073 | |||
| 1073 | 1074 | ||
| 1074 | |||
| 1075 | [fid, msg] = fopen (index_file, "r"); | 1075 | [fid, msg] = fopen (index_file, "r"); |
| 1076 | if (fid == -1) | 1076 | if (fid == -1) |
| 1077 | error ("the INDEX file %s could not be read: %s", | 1077 | error ("the INDEX file %s could not be read: %s", |
| 1078 | index_file, msg); | 1078 | index_file, msg); |
| 1079 | endif | 1079 | endif |
| 1080 | 1080 | ||
| @@ -1089,7 +1089,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) | |||
| 1089 | 1089 | ||
| 1090 | while (! feof (fid) || line != -1) | 1090 | while (! feof (fid) || line != -1) |
| 1091 | if (! any (! isspace (line)) || line(1) == "#" || any (line == "=")) | 1091 | if (! any (! isspace (line)) || line(1) == "#" || any (line == "=")) |
| 1092 | ## Comments, blank lines or comments about unimplemented | 1092 | ## Comments, blank lines or comments about unimplemented |
| 1093 | ## functions: do nothing | 1093 | ## functions: do nothing |
| 1094 | ## FIXME: probably comments and pointers to external functions | 1094 | ## FIXME: probably comments and pointers to external functions |
| 1095 | ## could be treated better when printing to screen? | 1095 | ## could be treated better when printing to screen? |
| @@ -1114,7 +1114,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) | |||
| 1114 | fclose (fid); | 1114 | fclose (fid); |
| 1115 | endfunction | 1115 | endfunction |
| 1116 | 1116 | ||
| 1117 | function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, | 1117 | function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, |
| 1118 | pkg_desc, status, verbose) | 1118 | pkg_desc, status, verbose) |
| 1119 | 1119 | ||
| 1120 | printf ("---\nPackage name:\n\t%s\n", pkg_name); | 1120 | printf ("---\nPackage name:\n\t%s\n", pkg_name); |
| @@ -1122,7 +1122,7 @@ function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, | |||
| 1122 | printf ("Short description:\n\t%s\n", pkg_desc); | 1122 | printf ("Short description:\n\t%s\n", pkg_desc); |
| 1123 | printf ("Status:\n\t%s\n", status); | 1123 | printf ("Status:\n\t%s\n", status); |
| 1124 | if (verbose) | 1124 | if (verbose) |
| 1125 | printf ("---\nProvides:\n"); | 1125 | printf ("---\nProvides:\n"); |
| 1126 | for i = 1:length(pkg_idx_struct) | 1126 | for i = 1:length(pkg_idx_struct) |
| 1127 | if (! isempty (pkg_idx_struct{i}.functions)) | 1127 | if (! isempty (pkg_idx_struct{i}.functions)) |
| 1128 | printf ("%s\n", pkg_idx_struct{i}.category); | 1128 | printf ("%s\n", pkg_idx_struct{i}.category); |
| @@ -1177,26 +1177,26 @@ function repackage (builddir, buildlist) | |||
| 1177 | unlink (fullfile (pack.name, "inst", "PKG_DEL")); | 1177 | unlink (fullfile (pack.name, "inst", "PKG_DEL")); |
| 1178 | endif | 1178 | endif |
| 1179 | if (exist (fullfile (archdir, "PKG_ADD"), "file")) | 1179 | if (exist (fullfile (archdir, "PKG_ADD"), "file")) |
| 1180 | movefile (fullfile (archdir, "PKG_ADD"), | 1180 | movefile (fullfile (archdir, "PKG_ADD"), |
| 1181 | fullfile (pack.name, "PKG_ADD")); | 1181 | fullfile (pack.name, "PKG_ADD")); |
| 1182 | endif | 1182 | endif |
| 1183 | if (exist (fullfile (archdir, "PKG_DEL"), "file")) | 1183 | if (exist (fullfile (archdir, "PKG_DEL"), "file")) |
| 1184 | movefile (fullfile (archdir, "PKG_DEL"), | 1184 | movefile (fullfile (archdir, "PKG_DEL"), |
| 1185 | fullfile (pack.name, "PKG_DEL")); | 1185 | fullfile (pack.name, "PKG_DEL")); |
| 1186 | endif | 1186 | endif |
| 1187 | else | 1187 | else |
| 1188 | if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) | 1188 | if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) |
| 1189 | movefile (fullfile (pack.name, "inst", "PKG_ADD"), | 1189 | movefile (fullfile (pack.name, "inst", "PKG_ADD"), |
| 1190 | fullfile (pack.name, "PKG_ADD")); | 1190 | fullfile (pack.name, "PKG_ADD")); |
| 1191 | endif | 1191 | endif |
| 1192 | if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) | 1192 | if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) |
| 1193 | movefile (fullfile (pack.name, "inst", "PKG_DEL"), | 1193 | movefile (fullfile (pack.name, "inst", "PKG_DEL"), |
| 1194 | fullfile (pack.name, "PKG_DEL")); | 1194 | fullfile (pack.name, "PKG_DEL")); |
| 1195 | endif | 1195 | endif |
| 1196 | endif | 1196 | endif |
| 1197 | tfile = cstrcat (pack.name, "-", pack.version, ".tar"); | 1197 | tfile = cstrcat (pack.name, "-", pack.version, ".tar"); |
| 1198 | tar (tfile, pack.name); | 1198 | tar (tfile, pack.name); |
| 1199 | try | 1199 | try |
| 1200 | gzip (tfile); | 1200 | gzip (tfile); |
| 1201 | unlink (tfile); | 1201 | unlink (tfile); |
| 1202 | catch | 1202 | catch |
| @@ -1231,7 +1231,7 @@ function prepare_installation (desc, packdir) | |||
| 1231 | wd = pwd (); | 1231 | wd = pwd (); |
| 1232 | try | 1232 | try |
| 1233 | cd (packdir); | 1233 | cd (packdir); |
| 1234 | pre_install (desc); | 1234 | pre_install (desc); |
| 1235 | cd (wd); | 1235 | cd (wd); |
| 1236 | catch | 1236 | catch |
| 1237 | cd (wd); | 1237 | cd (wd); |
| @@ -1245,13 +1245,13 @@ function prepare_installation (desc, packdir) | |||
| 1245 | [status, msg] = mkdir (inst_dir); | 1245 | [status, msg] = mkdir (inst_dir); |
| 1246 | if (status != 1) | 1246 | if (status != 1) |
| 1247 | rm_rf (desc.dir); | 1247 | rm_rf (desc.dir); |
| 1248 | error ("the 'inst' directory did not exist and could not be created: %s", | 1248 | error ("the 'inst' directory did not exist and could not be created: %s", |
| 1249 | msg); | 1249 | msg); |
| 1250 | endif | 1250 | endif |
| 1251 | endif | 1251 | endif |
| 1252 | endfunction | 1252 | endfunction |
| 1253 | 1253 | ||
| 1254 | function configure_make (desc, packdir, verbose) | 1254 | function configure_make (desc, packdir, verbose) |
| 1255 | ## Perform ./configure, make, make install in "src". | 1255 | ## Perform ./configure, make, make install in "src". |
| 1256 | if (exist (fullfile (packdir, "src"), "dir")) | 1256 | if (exist (fullfile (packdir, "src"), "dir")) |
| 1257 | src = fullfile (packdir, "src"); | 1257 | src = fullfile (packdir, "src"); |
| @@ -1362,7 +1362,7 @@ function configure_make (desc, packdir, verbose) | |||
| 1362 | printf (" %s", archdependent{:}); | 1362 | printf (" %s", archdependent{:}); |
| 1363 | printf (" %s\n", archdir); | 1363 | printf (" %s\n", archdir); |
| 1364 | endif | 1364 | endif |
| 1365 | if (! exist (archdir, "dir")) | 1365 | if (! exist (archdir, "dir")) |
| 1366 | mkdir (archdir); | 1366 | mkdir (archdir); |
| 1367 | endif | 1367 | endif |
| 1368 | [status, output] = copyfile (archdependent, archdir); | 1368 | [status, output] = copyfile (archdependent, archdir); |
| @@ -1398,8 +1398,8 @@ endfunction | |||
| 1398 | function create_pkgadddel (desc, packdir, nm, global_install) | 1398 | function create_pkgadddel (desc, packdir, nm, global_install) |
| 1399 | instpkg = fullfile (desc.dir, nm); | 1399 | instpkg = fullfile (desc.dir, nm); |
| 1400 | instfid = fopen (instpkg, "wt"); | 1400 | instfid = fopen (instpkg, "wt"); |
| 1401 | ## If it is exists, most of the PKG_* file should go into the | 1401 | ## If it is exists, most of the PKG_* file should go into the |
| 1402 | ## architecture dependent directory so that the autoload/mfilename | 1402 | ## architecture dependent directory so that the autoload/mfilename |
| 1403 | ## commands work as expected. The only part that doesn't is the | 1403 | ## commands work as expected. The only part that doesn't is the |
| 1404 | ## part in the main directory. | 1404 | ## part in the main directory. |
| 1405 | archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", | 1405 | archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", |
| @@ -1465,7 +1465,7 @@ function copy_files (desc, packdir, global_install) | |||
| 1465 | if (! exist (desc.dir, "dir")) | 1465 | if (! exist (desc.dir, "dir")) |
| 1466 | [status, output] = mkdir (desc.dir); | 1466 | [status, output] = mkdir (desc.dir); |
| 1467 | if (status != 1) | 1467 | if (status != 1) |
| 1468 | error ("couldn't create installation directory %s : %s", | 1468 | error ("couldn't create installation directory %s : %s", |
| 1469 | desc.dir, output); | 1469 | desc.dir, output); |
| 1470 | endif | 1470 | endif |
| 1471 | endif | 1471 | endif |
| @@ -1493,32 +1493,32 @@ function copy_files (desc, packdir, global_install) | |||
| 1493 | [status, output] = mkdir (octm3); | 1493 | [status, output] = mkdir (octm3); |
| 1494 | if (status != 1) | 1494 | if (status != 1) |
| 1495 | rm_rf (desc.dir); | 1495 | rm_rf (desc.dir); |
| 1496 | error ("couldn't create installation directory %s : %s", | 1496 | error ("couldn't create installation directory %s : %s", |
| 1497 | octm3, output); | 1497 | octm3, output); |
| 1498 | endif | 1498 | endif |
| 1499 | endif | 1499 | endif |
| 1500 | [status, output] = mkdir (octm2); | 1500 | [status, output] = mkdir (octm2); |
| 1501 | if (status != 1) | 1501 | if (status != 1) |
| 1502 | rm_rf (desc.dir); | 1502 | rm_rf (desc.dir); |
| 1503 | error ("couldn't create installation directory %s : %s", | 1503 | error ("couldn't create installation directory %s : %s", |
| 1504 | octm2, output); | 1504 | octm2, output); |
| 1505 | endif | 1505 | endif |
| 1506 | endif | 1506 | endif |
| 1507 | [status, output] = mkdir (octm1); | 1507 | [status, output] = mkdir (octm1); |
| 1508 | if (status != 1) | 1508 | if (status != 1) |
| 1509 | rm_rf (desc.dir); | 1509 | rm_rf (desc.dir); |
| 1510 | error ("couldn't create installation directory %s : %s", | 1510 | error ("couldn't create installation directory %s : %s", |
| 1511 | octm1, output); | 1511 | octm1, output); |
| 1512 | endif | 1512 | endif |
| 1513 | endif | 1513 | endif |
| 1514 | [status, output] = mkdir (octfiledir); | 1514 | [status, output] = mkdir (octfiledir); |
| 1515 | if (status != 1) | 1515 | if (status != 1) |
| 1516 | rm_rf (desc.dir); | 1516 | rm_rf (desc.dir); |
| 1517 | error ("couldn't create installation directory %s : %s", | 1517 | error ("couldn't create installation directory %s : %s", |
| 1518 | octfiledir, output); | 1518 | octfiledir, output); |
| 1519 | endif | 1519 | endif |
| 1520 | endif | 1520 | endif |
| 1521 | [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), | 1521 | [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), |
| 1522 | octfiledir); | 1522 | octfiledir); |
| 1523 | rm_rf (fullfile (desc.dir, getarch ())); | 1523 | rm_rf (fullfile (desc.dir, getarch ())); |
| 1524 | 1524 | ||
| @@ -1753,7 +1753,7 @@ function deps_cell = fix_depends (depends) | |||
| 1753 | version = fix_version (parts{2}); | 1753 | version = fix_version (parts{2}); |
| 1754 | 1754 | ||
| 1755 | ## If no version is specified for the dependency | 1755 | ## If no version is specified for the dependency |
| 1756 | ## we say that the version should be greater than | 1756 | ## we say that the version should be greater than |
| 1757 | ## or equal to "0.0.0". | 1757 | ## or equal to "0.0.0". |
| 1758 | else | 1758 | else |
| 1759 | package = tolower (strip (dep)); | 1759 | package = tolower (strip (dep)); |
| @@ -1813,7 +1813,7 @@ function write_index (desc, dir, index_file, global_install) | |||
| 1813 | if (err) | 1813 | if (err) |
| 1814 | error ("couldn't read directory %s: %s", tmpdir, msg); | 1814 | error ("couldn't read directory %s: %s", tmpdir, msg); |
| 1815 | endif | 1815 | endif |
| 1816 | files = [files; files2]; | 1816 | files = [files; files2]; |
| 1817 | endif | 1817 | endif |
| 1818 | 1818 | ||
| 1819 | functions = {}; | 1819 | functions = {}; |
| @@ -1910,7 +1910,7 @@ function [out1, out2] = installed_packages (local_list, global_list) | |||
| 1910 | endfor | 1910 | endfor |
| 1911 | if (! isempty(dup)) | 1911 | if (! isempty(dup)) |
| 1912 | installed_pkgs_lst(dup) = []; | 1912 | installed_pkgs_lst(dup) = []; |
| 1913 | endif | 1913 | endif |
| 1914 | 1914 | ||
| 1915 | ## Now check if the package is loaded. | 1915 | ## Now check if the package is loaded. |
| 1916 | tmppath = strrep (path(), "\\", "/"); | 1916 | tmppath = strrep (path(), "\\", "/"); |
| @@ -1957,9 +1957,9 @@ function [out1, out2] = installed_packages (local_list, global_list) | |||
| 1957 | h1 = "Package Name"; | 1957 | h1 = "Package Name"; |
| 1958 | h2 = "Version"; | 1958 | h2 = "Version"; |
| 1959 | h3 = "Installation directory"; | 1959 | h3 = "Installation directory"; |
| 1960 | max_name_length = length (h1); | 1960 | max_name_length = length (h1); |
| 1961 | max_version_length = length (h2); | 1961 | max_version_length = length (h2); |
| 1962 | names = cell (num_packages, 1); | 1962 | names = cell (num_packages, 1); |
| 1963 | for i = 1:num_packages | 1963 | for i = 1:num_packages |
| 1964 | max_name_length = max (max_name_length, | 1964 | max_name_length = max (max_name_length, |
| 1965 | length (installed_pkgs_lst{i}.name)); | 1965 | length (installed_pkgs_lst{i}.name)); |
| @@ -1996,7 +1996,7 @@ function [out1, out2] = installed_packages (local_list, global_list) | |||
| 1996 | first_char = length (cur_dir) - max_dir_length + 4; | 1996 | first_char = length (cur_dir) - max_dir_length + 4; |
| 1997 | first_filesep = strfind (cur_dir(first_char:end), filesep()); | 1997 | first_filesep = strfind (cur_dir(first_char:end), filesep()); |
| 1998 | if (! isempty (first_filesep)) | 1998 | if (! isempty (first_filesep)) |
| 1999 | cur_dir = cstrcat ("...", | 1999 | cur_dir = cstrcat ("...", |
| 2000 | cur_dir((first_char + first_filesep(1) - 1):end)); | 2000 | cur_dir((first_char + first_filesep(1) - 1):end)); |
| 2001 | else | 2001 | else |
| 2002 | cur_dir = cstrcat ("...", cur_dir(first_char:end)); | 2002 | cur_dir = cstrcat ("...", cur_dir(first_char:end)); |
| @@ -2026,7 +2026,7 @@ function load_packages (files, handle_deps, local_list, global_list) | |||
| 2026 | if (length (files) == 1 && strcmp (files{1}, "all")) | 2026 | if (length (files) == 1 && strcmp (files{1}, "all")) |
| 2027 | idx = [1:length(installed_pkgs_lst)]; | 2027 | idx = [1:length(installed_pkgs_lst)]; |
| 2028 | ## Load auto. | 2028 | ## Load auto. |
| 2029 | elseif (length (files) == 1 && strcmp (files{1}, "auto")) | 2029 | elseif (length (files) == 1 && strcmp (files{1}, "auto")) |
| 2030 | idx = []; | 2030 | idx = []; |
| 2031 | for i = 1:length (installed_pkgs_lst) | 2031 | for i = 1:length (installed_pkgs_lst) |
| 2032 | if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) | 2032 | if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) |
| @@ -2162,7 +2162,7 @@ endfunction | |||
| 2162 | 2162 | ||
| 2163 | function archprefix = getarchprefix (desc, global_install) | 2163 | function archprefix = getarchprefix (desc, global_install) |
| 2164 | if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) | 2164 | if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) |
| 2165 | archprefix = fullfile (octave_config_info ("libexecdir"), "octave", | 2165 | archprefix = fullfile (octave_config_info ("libexecdir"), "octave", |
| 2166 | "packages", cstrcat(desc.name, "-", desc.version)); | 2166 | "packages", cstrcat(desc.name, "-", desc.version)); |
| 2167 | else | 2167 | else |
| 2168 | archprefix = desc.dir; | 2168 | archprefix = desc.dir; |
| @@ -2207,7 +2207,7 @@ function newdesc = save_order (desc) | |||
| 2207 | newdesc = {}; | 2207 | newdesc = {}; |
| 2208 | for i = 1 : length(desc) | 2208 | for i = 1 : length(desc) |
| 2209 | deps = desc{i}.depends; | 2209 | deps = desc{i}.depends; |
| 2210 | if (isempty (deps) || (length (deps) == 1 && | 2210 | if (isempty (deps) || (length (deps) == 1 && |
| 2211 | strcmp(deps{1}.package, "octave"))) | 2211 | strcmp(deps{1}.package, "octave"))) |
| 2212 | newdesc {end + 1} = desc{i}; | 2212 | newdesc {end + 1} = desc{i}; |
| 2213 | else | 2213 | else |
| @@ -2220,7 +2220,7 @@ function newdesc = save_order (desc) | |||
| 2220 | endif | 2220 | endif |
| 2221 | endfor | 2221 | endfor |
| 2222 | endfor | 2222 | endfor |
| 2223 | if (! isempty (tmpdesc)) | 2223 | if (! isempty (tmpdesc)) |
| 2224 | newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; | 2224 | newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; |
| 2225 | else | 2225 | else |
| 2226 | newdesc{end+1} = desc{i}; | 2226 | newdesc{end+1} = desc{i}; |
| @@ -2278,7 +2278,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) | |||
| 2278 | else | 2278 | else |
| 2279 | if (handle_deps) | 2279 | if (handle_deps) |
| 2280 | deps = installed_pkgs_lst{i}.depends; | 2280 | deps = installed_pkgs_lst{i}.depends; |
| 2281 | if ((length (deps) > 1) || (length (deps) == 1 && | 2281 | if ((length (deps) > 1) || (length (deps) == 1 && |
| 2282 | ! strcmp(deps{1}.package, "octave"))) | 2282 | ! strcmp(deps{1}.package, "octave"))) |
| 2283 | tmplidx = []; | 2283 | tmplidx = []; |
| 2284 | for k = 1 : length (deps) | 2284 | for k = 1 : length (deps) |
| @@ -2289,7 +2289,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) | |||
| 2289 | endif | 2289 | endif |
| 2290 | endfor | 2290 | endfor |
| 2291 | endfor | 2291 | endfor |
| 2292 | idx = load_package_dirs (tmplidx, idx, handle_deps, | 2292 | idx = load_package_dirs (tmplidx, idx, handle_deps, |
| 2293 | installed_pkgs_lst); | 2293 | installed_pkgs_lst); |
| 2294 | endif | 2294 | endif |
| 2295 | endif | 2295 | endif |