aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-03-02 08:55:47 +0000
committerJuanma Barranquero2009-03-02 08:55:47 +0000
commita8ce3d17d885d00219bd43652c5e6cea4bd405b0 (patch)
tree2d427fef17fcf77b7385a472389870c29b10be0c
parent37aca7a833cbca7a73d90e45701832fb58511eff (diff)
downloademacs-a8ce3d17d885d00219bd43652c5e6cea4bd405b0.tar.gz
emacs-a8ce3d17d885d00219bd43652c5e6cea4bd405b0.zip
Fix typos.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/mark.texi2
-rw-r--r--lisp/doc-view.el4
-rw-r--r--lisp/erc/ChangeLog.022
-rw-r--r--lisp/font-lock.el3
-rw-r--r--lisp/mh-e/ChangeLog.12
-rw-r--r--src/gtkutil.c2
7 files changed, 12 insertions, 7 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8a30d75f87b..cbc089b5bef 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12009-03-02 Juanma Barranquero <lekktu@gmail.com>
2
3 * mark.texi (Marking Objects): Fix typo.
4
12009-03-01 Chong Yidong <cyd@stupidchicken.com> 52009-03-01 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * abbrevs.texi (Expanding Abbrevs): Mention abbrev-expand-functions 7 * abbrevs.texi (Expanding Abbrevs): Mention abbrev-expand-functions
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index b9a1188a73e..3f72d7da64a 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -180,7 +180,7 @@ that paragraph, and the mark goes at the start of the region.
180 Similarly, @kbd{C-M-h} (@code{mark-defun}) sets mark and point 180 Similarly, @kbd{C-M-h} (@code{mark-defun}) sets mark and point
181around major top-level definitions (@pxref{Moving by Defuns}), and 181around major top-level definitions (@pxref{Moving by Defuns}), and
182@kbd{C-x C-p} (@code{mark-page}) does the same for pages 182@kbd{C-x C-p} (@code{mark-page}) does the same for pages
183(@pxref{Pages}). These treat repeated invokations and prefix 183(@pxref{Pages}). These treat repeated invocations and prefix
184arguments similarly to @code{mark-paragraph}. 184arguments similarly to @code{mark-paragraph}.
185 185
186 Finally, @kbd{C-x h} (@code{mark-whole-buffer}) sets up the entire 186 Finally, @kbd{C-x h} (@code{mark-whole-buffer}) sets up the entire
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 13ebe3e92f9..c9ad392a0b7 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -62,7 +62,7 @@
62;; slice you can use `doc-view-set-slice' (bound to `s s') which will query you 62;; slice you can use `doc-view-set-slice' (bound to `s s') which will query you
63;; for the coordinates of the slice's top-left corner and its width and height. 63;; for the coordinates of the slice's top-left corner and its width and height.
64;; A much more convenient way to do the same is offered by the command 64;; A much more convenient way to do the same is offered by the command
65;; `doc-view-set-slice-using-mouse' (bound to `s m'). After invokation you 65;; `doc-view-set-slice-using-mouse' (bound to `s m'). After invocation you
66;; only have to press mouse-1 at the top-left corner and drag it to the 66;; only have to press mouse-1 at the top-left corner and drag it to the
67;; bottom-right corner of the desired slice. To reset the slice use 67;; bottom-right corner of the desired slice. To reset the slice use
68;; `doc-view-reset-slice' (bound to `s r'). 68;; `doc-view-reset-slice' (bound to `s r').
@@ -74,7 +74,7 @@
74;; `C-r' you can do the same, but backwards. To search for a new regexp give a 74;; `C-r' you can do the same, but backwards. To search for a new regexp give a
75;; prefix arg to one of the search functions, e.g. by typing `C-u C-s'. The 75;; prefix arg to one of the search functions, e.g. by typing `C-u C-s'. The
76;; searching works by using a plain text representation of the document. If 76;; searching works by using a plain text representation of the document. If
77;; that doesn't already exist the first invokation of `doc-view-search' (or 77;; that doesn't already exist the first invocation of `doc-view-search' (or
78;; `doc-view-search-backward') starts the conversion. When that finishes and 78;; `doc-view-search-backward') starts the conversion. When that finishes and
79;; you're still viewing the document (i.e. you didn't switch to another buffer) 79;; you're still viewing the document (i.e. you didn't switch to another buffer)
80;; you're queried for the regexp then. 80;; you're queried for the regexp then.
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index b79f83b9cea..5e1ce64ba56 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2371,7 +2371,7 @@
2371 Minor docstring fixes (using M-x checkdoc-current-buffer) 2371 Minor docstring fixes (using M-x checkdoc-current-buffer)
2372 If you find time, and you are native english speaker, do that too!! 2372 If you find time, and you are native english speaker, do that too!!
2373 2373
2374 * erc.el: fixed macro-invokation 2374 * erc.el: fixed macro-invocation
2375 2375
23762002-01-31 Andreas Fuchs <asf@void.at> 23762002-01-31 Andreas Fuchs <asf@void.at>
2377 2377
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index ccbf09b75ea..f7b8fac3dc7 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2239,7 +2239,8 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
2239 "\\)\\)\\>" 2239 "\\)\\)\\>"
2240 ;; Any whitespace and defined object. 2240 ;; Any whitespace and defined object.
2241 "[ \t'\(]*" 2241 "[ \t'\(]*"
2242 "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?") 2242 "\\(setf[ \t]+\\sw+\\|\\sw+\\)?"
2243 "[ \t)]*")
2243 (1 font-lock-keyword-face) 2244 (1 font-lock-keyword-face)
2244 (9 (cond ((match-beginning 3) font-lock-function-name-face) 2245 (9 (cond ((match-beginning 3) font-lock-function-name-face)
2245 ((match-beginning 6) font-lock-variable-name-face) 2246 ((match-beginning 6) font-lock-variable-name-face)
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 71e4e9cb264..534cfa2f28f 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -8034,7 +8034,7 @@
8034 XEmacs too. Sanitize so that it will work using least-common 8034 XEmacs too. Sanitize so that it will work using least-common
8035 denominator versions of 'make'. Tested using GNU make, Solaris make, 8035 denominator versions of 'make'. Tested using GNU make, Solaris make,
8036 and Berkely make. 8036 and Berkely make.
8037 (all): Use recursive invokation based on the emacs or xemacs 8037 (all): Use recursive invocation based on the emacs or xemacs
8038 executable passed on the 'make EMACS=xemacs' command line. 8038 executable passed on the 'make EMACS=xemacs' command line.
8039 (XEMACS_OPTIONS): The incantation to be passed to an xemacs editor 8039 (XEMACS_OPTIONS): The incantation to be passed to an xemacs editor
8040 to compile things properly. 8040 to compile things properly.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index ee59de91e39..39781cfd56f 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2588,7 +2588,7 @@ xg_update_menubar (menubar, f, list, iter, pos, val,
2588/* Update the menu item W so it corresponds to VAL. 2588/* Update the menu item W so it corresponds to VAL.
2589 SELECT_CB is the callback to use when a menu item is selected. 2589 SELECT_CB is the callback to use when a menu item is selected.
2590 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. 2590 HIGHLIGHT_CB is the callback to call when entering/leaving menu items.
2591 CL_DATA is the data to set in the widget for menu invokation. */ 2591 CL_DATA is the data to set in the widget for menu invocation. */
2592 2592
2593static void 2593static void
2594xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) 2594xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data)