merge trunk

3 files changed, 18 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b2f0ebd99e..2097f6c1973 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,12 @@
         charset by adding `charset' text property.  Improve the whole
         algorithm.
 
+2010-08-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emulation/pc-select.el (pc-selection-mode-hook)
+        (copy-region-as-kill-nomark, beginning-of-buffer-mark)
+        (pc-selection-mode): Fix typos in docstrings.
+
 2010-08-04  Kenichi Handa  <handa@m17n.org>
 
         * language/cyrillic.el: Don't add "microsoft-cp1251" to
@@ -26,6 +32,10 @@
         (ctext-no-compositions): Doc fix.
         (compound-text-with-extensions): Doc fix.
 
+2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (exchange-dot-and-mark): Mark obsolete, finally.
+
 2010-08-03  Juanma Barranquero  <lekktu@gmail.com>
 
         * progmodes/which-func.el (which-func-format): Split help-echo text
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index db47ee4276b..22983f49694 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -108,7 +108,7 @@ This gives mostly Emacs-like behavior with only the selection keys enabled."
   :group 'pc-select)
 
 (defcustom pc-selection-mode-hook nil
-  "The hook to run when pc-selection-mode is toggled."
+  "The hook to run when PC Selection mode is toggled."
   :type 'hook
   :group 'pc-select)
 
@@ -259,7 +259,7 @@ association.")
 (provide 'pc-select)
 
 (defun copy-region-as-kill-nomark (beg end)
-  "Save the region as if killed; but don't kill it; deactivate mark.
+  "Save the region as if killed, but don't kill it; deactivate mark.
 If `interprogram-cut-function' is non-nil, also save the text for a window
 system cut and paste.
 
@@ -567,7 +567,7 @@ Don't use this command in Lisp programs!
 ;;;;;;;;;;;;;;;;;;;;
 
 (defun backward-char-mark (&optional arg)
-"Ensure mark is active; move point left ARG characters (right if ARG negative).
+  "Ensure mark is active; move point left ARG characters (right if ARG negative).
 On attempt to pass beginning or end of buffer, stop and signal error."
   (interactive "p")
   (pc-select-ensure-mark)
@@ -631,7 +631,7 @@ If scan reaches end of buffer, stop there without error."
 
 
 (defun scroll-up-mark (&optional arg)
-"Ensure mark is active; scroll upward ARG lines; or near full screen if no ARG.
+  "Ensure mark is active; scroll upward ARG lines; or near full screen if no ARG.
 A near full screen is `next-screen-context-lines' less than a full screen.
 Negative ARG means scroll downward.
 When calling from a program, supply a number as argument or nil.
@@ -652,7 +652,7 @@ If the buffer is narrowed, this command uses the beginning and size
 of the accessible part of the buffer.
 
 Don't use this command in Lisp programs!
-\(goto-char (p\oint-min)) is faster and avoids clobbering the mark."
+\(goto-char (point-min)) is faster and avoids clobbering the mark."
   (interactive "P")
   (pc-select-ensure-mark)
   (let ((size (- (point-max) (point-min))))
@@ -839,7 +839,7 @@ If the value is non-nil, call the function MODE with an argument of
 
 ;;;###autoload
 (define-minor-mode pc-selection-mode
-  "Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style.
+  "Change mark behavior to emulate Motif, Mac or MS-Windows cut and paste style.
 
 This mode enables Delete Selection mode and Transient Mark mode.
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 6c8725a813f..d0c27656e41 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3819,7 +3819,8 @@ Does not set point.  Does nothing if mark ring is empty."
     (setq mark-ring (cdr mark-ring)))
   (deactivate-mark))
 
-(defalias 'exchange-dot-and-mark 'exchange-point-and-mark)
+(define-obsolete-function-alias
+  'exchange-dot-and-mark 'exchange-point-and-mark "23.3")
 (defun exchange-point-and-mark (&optional arg)
   "Put the mark where point is now, and point where the mark is now.
 This command works even when the mark is not active,