summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2006-10-11 06:27:08 +0000
committerJan Djärv <jan.h.d@swipnet.se>2006-10-11 06:27:08 +0000
commita3545af4a82be7b032738a2d0cc7e5e7f3ac78f0 (patch)
treefe5dcd4ddfdc8665ab5a4607a1ac90b89f22df16 /lisp
parent90e4b32d3a45b460f8155389ceb857c9473a0793 (diff)
downloademacs-a3545af4a82be7b032738a2d0cc7e5e7f3ac78f0.tar.gz
* dnd.el (dnd-handle-one-url): Fix typo in doc-string.
* help-at-pt.el (scan-buf-move-to-region): Likewise. * longlines.el (longlines-window-change-function): Likewise. * simple.el (undo-ask-before-discard): Likewise. * wid-edit.el (widget-field-prompt-internal) (widget-documentation-link-p): Likewise
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/dnd.el2
-rw-r--r--lisp/help-at-pt.el2
-rw-r--r--lisp/longlines.el2
-rw-r--r--lisp/simple.el2
-rw-r--r--lisp/wid-edit.el4
6 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b5515349bf..7815c4e0b8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-11 Martin Rudalics <rudalics@gmx.at>
+
+ * dnd.el (dnd-handle-one-url): Fix typo in doc-string.
+ * help-at-pt.el (scan-buf-move-to-region): Likewise.
+ * longlines.el (longlines-window-change-function): Likewise.
+ * simple.el (undo-ask-before-discard): Likewise.
+ * wid-edit.el (widget-field-prompt-internal)
+ (widget-documentation-link-p): Likewise
+
2006-10-10 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el (sh-get-kw): | is not among the allowed chars
diff --git a/lisp/dnd.el b/lisp/dnd.el
index f8cdf9a1239..1f3c8d71266 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -91,7 +91,7 @@ The handler is first located by looking at `dnd-protocol-alist'.
If no match is found here, and the value of `browse-url-browser-function'
is a pair of (REGEXP . FUNCTION), those regexps are tried for a match.
If no match is found, just call `dnd-insert-text'.
-WINDOW is where the drop happend, ACTION is the action for the drop,
+WINDOW is where the drop happened, ACTION is the action for the drop,
URL is what has been dropped.
Returns ACTION."
(require 'browse-url)
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index db00fff6c1c..6d33c155c64 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -246,7 +246,7 @@ properties, to enable buffer local values."
(defun scan-buf-move-to-region (prop &optional arg hook)
"Go to the start of the next region with non-nil PROP property.
Then run HOOK, which should be a quoted symbol that is a normal
-hook.variable, or an expression evaluating to such a symbol.
+hook variable, or an expression evaluating to such a symbol.
Adjacent areas with different non-nil PROP properties are
considered different regions.
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 77e0b415344..ee469e1be09 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -410,7 +410,7 @@ This is called by `post-command-hook' after each command."
(defun longlines-window-change-function ()
"Re-wrap the buffer if the window width has changed.
-This is called by `window-size-change-functions'."
+This is called by `window-configuration-change-hook'."
(when (/= fill-column (- (window-width) window-min-width))
(setq fill-column (- (window-width) window-min-width))
(let ((mod (buffer-modified-p)))
diff --git a/lisp/simple.el b/lisp/simple.el
index 8bd3a30a59b..6655539a618 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1675,7 +1675,7 @@ is not *inside* the region START...END."
Normally, Emacs discards the undo info for the current command if
it exceeds `undo-outer-limit'. But if you set this option
non-nil, it asks in the echo area whether to discard the info.
-If you answer no, there a slight risk that Emacs might crash, so
+If you answer no, there is a slight risk that Emacs might crash, so
only do it if you really want to undo the command.
This option is mainly intended for debugging. You have to be
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 5d8580ef22c..af41424ca75 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1873,7 +1873,7 @@ If END is omitted, it defaults to the length of LIST."
"History of field minibuffer edits.")
(defun widget-field-prompt-internal (widget prompt initial history)
- "Read string for WIDGET promptinhg with PROMPT.
+ "Read string for WIDGET prompting with PROMPT.
INITIAL is the initial input and HISTORY is a symbol containing
the earlier input."
(read-string prompt initial history))
@@ -2864,7 +2864,7 @@ The first group should be the link itself."
(defcustom widget-documentation-link-p 'intern-soft
"Predicate used to test if a string is useful as a link.
-The value should be a function. The function will be called one
+The value should be a function. The function will be called with one
argument, a string, and should return non-nil if there should be a
link for that string."
:type 'function