aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-06-20 14:55:24 +0200
committerDeniz Dogan2011-06-20 14:55:24 +0200
commitaebf69c8b3dc592ea315c187feb5f69b884a850e (patch)
treef6ed219e92fa48baf8dc695d1d9ef858220c43db
parent76147d94eba6d6d25375e056a8e9d4ea5e4f6a37 (diff)
downloademacs-aebf69c8b3dc592ea315c187feb5f69b884a850e.tar.gz
emacs-aebf69c8b3dc592ea315c187feb5f69b884a850e.zip
* lisp/net/rcirc.el: Delete trailing whitespaces once and for all.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el16
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4224f9b886f..a7176483152 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-06-20 Deniz Dogan <deniz@dogan.se>
2
3 * net/rcirc.el: Delete trailing whitespaces once and for all.
4
12011-06-20 Martin Rudalics <rudalics@gmx.at> 52011-06-20 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (get-window-with-predicate): Start scanning with 7 * window.el (get-window-with-predicate): Start scanning with
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 70190867e89..f7f5f61fafe 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -987,7 +987,7 @@ This number is independent of the number of lines in the buffer.")
987 (setq buffer-invisibility-spec '()) 987 (setq buffer-invisibility-spec '())
988 (setq buffer-display-table (make-display-table)) 988 (setq buffer-display-table (make-display-table))
989 (set-display-table-slot buffer-display-table 4 989 (set-display-table-slot buffer-display-table 4
990 (let ((glyph (make-glyph-code 990 (let ((glyph (make-glyph-code
991 ?. 'font-lock-keyword-face))) 991 ?. 'font-lock-keyword-face)))
992 (make-vector 3 glyph))) 992 (make-vector 3 glyph)))
993 993
@@ -1151,7 +1151,7 @@ Create the buffer if it doesn't exist."
1151 (rcirc-generate-new-buffer-name process target)))) 1151 (rcirc-generate-new-buffer-name process target))))
1152 (with-current-buffer new-buffer 1152 (with-current-buffer new-buffer
1153 (rcirc-mode process target) 1153 (rcirc-mode process target)
1154 (rcirc-put-nick-channel process (rcirc-nick process) target 1154 (rcirc-put-nick-channel process (rcirc-nick process) target
1155 rcirc-current-line)) 1155 rcirc-current-line))
1156 new-buffer))))) 1156 new-buffer)))))
1157 1157
@@ -1238,7 +1238,7 @@ Create the buffer if it doesn't exist."
1238 (interactive) 1238 (interactive)
1239 (let ((pos (1+ (- (point) rcirc-prompt-end-marker)))) 1239 (let ((pos (1+ (- (point) rcirc-prompt-end-marker))))
1240 (goto-char (point-max)) 1240 (goto-char (point-max))
1241 (let ((text (buffer-substring-no-properties rcirc-prompt-end-marker 1241 (let ((text (buffer-substring-no-properties rcirc-prompt-end-marker
1242 (point))) 1242 (point)))
1243 (parent (buffer-name))) 1243 (parent (buffer-name)))
1244 (delete-region rcirc-prompt-end-marker (point)) 1244 (delete-region rcirc-prompt-end-marker (point))
@@ -1477,7 +1477,7 @@ record activity."
1477 (match-string 1 text))) 1477 (match-string 1 text)))
1478 rcirc-ignore-list)) 1478 rcirc-ignore-list))
1479 ;; do not ignore if we sent the message 1479 ;; do not ignore if we sent the message
1480 (not (string= sender (rcirc-nick process)))) 1480 (not (string= sender (rcirc-nick process))))
1481 (let* ((buffer (rcirc-target-buffer process sender response target text)) 1481 (let* ((buffer (rcirc-target-buffer process sender response target text))
1482 (inhibit-read-only t)) 1482 (inhibit-read-only t))
1483 (with-current-buffer buffer 1483 (with-current-buffer buffer
@@ -1655,8 +1655,8 @@ log-files with absolute names (see `rcirc-log-filename-function')."
1655(defun rcirc-view-log-file () 1655(defun rcirc-view-log-file ()
1656 "View logfile corresponding to the current buffer." 1656 "View logfile corresponding to the current buffer."
1657 (interactive) 1657 (interactive)
1658 (find-file-other-window 1658 (find-file-other-window
1659 (expand-file-name (funcall rcirc-log-filename-function 1659 (expand-file-name (funcall rcirc-log-filename-function
1660 (rcirc-buffer-process) rcirc-target) 1660 (rcirc-buffer-process) rcirc-target)
1661 rcirc-log-directory))) 1661 rcirc-log-directory)))
1662 1662
@@ -2446,7 +2446,7 @@ keywords when no KEYWORD is given."
2446 rcirc-fill-column) 2446 rcirc-fill-column)
2447 (t fill-column)) 2447 (t fill-column))
2448 ;; make sure ... doesn't cause line wrapping 2448 ;; make sure ... doesn't cause line wrapping
2449 3))) 2449 3)))
2450 (fill-region (point) (point-max) nil t)))) 2450 (fill-region (point) (point-max) nil t))))
2451 2451
2452;;; handlers 2452;;; handlers
@@ -2813,7 +2813,7 @@ Passwords are stored in `rcirc-authinfo' (which see)."
2813 ;; quakenet authentication doesn't rely on the user's nickname. 2813 ;; quakenet authentication doesn't rely on the user's nickname.
2814 ;; the variable `nick' here represents the Q account name. 2814 ;; the variable `nick' here represents the Q account name.
2815 (when (eq method 'quakenet) 2815 (when (eq method 'quakenet)
2816 (rcirc-send-privmsg 2816 (rcirc-send-privmsg
2817 process 2817 process
2818 "Q@CServe.quakenet.org" 2818 "Q@CServe.quakenet.org"
2819 (format "AUTH %s %s" nick (car args)))))))))) 2819 (format "AUTH %s %s" nick (car args))))))))))