Mercurial > emacs
changeset 109713:b5fcc3bee61e
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 06 Aug 2010 17:15:12 +0900 |
| parents | 62d9702eb261 (current diff) de86f640dbaa (diff) |
| children | 091f3ff9a59e 1741530211a6 |
| files | lisp/ChangeLog |
| diffstat | 4 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.bzrignore Fri Aug 06 17:11:19 2010 +0900 +++ b/.bzrignore Fri Aug 06 17:15:12 2010 +0900 @@ -68,3 +68,4 @@ src/core core lib-src/stamp-* ++*
--- a/lisp/ChangeLog Fri Aug 06 17:11:19 2010 +0900 +++ b/lisp/ChangeLog Fri Aug 06 17:15:12 2010 +0900 @@ -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
--- a/lisp/emulation/pc-select.el Fri Aug 06 17:11:19 2010 +0900 +++ b/lisp/emulation/pc-select.el Fri Aug 06 17:15:12 2010 +0900 @@ -108,7 +108,7 @@ :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 @@ (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 @@ ;;;;;;;;;;;;;;;;;;;; (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 @@ (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 @@ 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 @@ ;;;###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.
--- a/lisp/simple.el Fri Aug 06 17:11:19 2010 +0900 +++ b/lisp/simple.el Fri Aug 06 17:15:12 2010 +0900 @@ -3819,7 +3819,8 @@ (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,