diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 552c3f5c088..3840e299cb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-08-28 Deniz Dogan <deniz@dogan.se> | ||
| 2 | |||
| 3 | * net/rcirc.el (rcirc-insert-prev-input) | ||
| 4 | (rcirc-insert-next-input): Remove unused argument. | ||
| 5 | |||
| 1 | 2011-08-28 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2011-08-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * shell.el (shell-parse-pcomplete-arguments): Unquote args (bug#9160). | 8 | * shell.el (shell-parse-pcomplete-arguments): Unquote args (bug#9160). |
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index de2c3adba95..71b3fe0c4a1 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -815,18 +815,19 @@ If SILENT is non-nil, do not print the message in any irc buffer." | |||
| 815 | 815 | ||
| 816 | (defvar rcirc-input-ring nil) | 816 | (defvar rcirc-input-ring nil) |
| 817 | (defvar rcirc-input-ring-index 0) | 817 | (defvar rcirc-input-ring-index 0) |
| 818 | |||
| 818 | (defun rcirc-prev-input-string (arg) | 819 | (defun rcirc-prev-input-string (arg) |
| 819 | (ring-ref rcirc-input-ring (+ rcirc-input-ring-index arg))) | 820 | (ring-ref rcirc-input-ring (+ rcirc-input-ring-index arg))) |
| 820 | 821 | ||
| 821 | (defun rcirc-insert-prev-input (arg) | 822 | (defun rcirc-insert-prev-input () |
| 822 | (interactive "p") | 823 | (interactive) |
| 823 | (when (<= rcirc-prompt-end-marker (point)) | 824 | (when (<= rcirc-prompt-end-marker (point)) |
| 824 | (delete-region rcirc-prompt-end-marker (point-max)) | 825 | (delete-region rcirc-prompt-end-marker (point-max)) |
| 825 | (insert (rcirc-prev-input-string 0)) | 826 | (insert (rcirc-prev-input-string 0)) |
| 826 | (setq rcirc-input-ring-index (1+ rcirc-input-ring-index)))) | 827 | (setq rcirc-input-ring-index (1+ rcirc-input-ring-index)))) |
| 827 | 828 | ||
| 828 | (defun rcirc-insert-next-input (arg) | 829 | (defun rcirc-insert-next-input () |
| 829 | (interactive "p") | 830 | (interactive) |
| 830 | (when (<= rcirc-prompt-end-marker (point)) | 831 | (when (<= rcirc-prompt-end-marker (point)) |
| 831 | (delete-region rcirc-prompt-end-marker (point-max)) | 832 | (delete-region rcirc-prompt-end-marker (point-max)) |
| 832 | (setq rcirc-input-ring-index (1- rcirc-input-ring-index)) | 833 | (setq rcirc-input-ring-index (1- rcirc-input-ring-index)) |