diff options
| author | Paul Eggert | 2011-10-29 10:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-29 10:33:13 -0700 |
| commit | 8d0eb4c275581847990b85dbb350caa3df9e653f (patch) | |
| tree | c161f977d59ac3103b04dc0f4aea57c83436a456 /lisp/net | |
| parent | 929bb973dd3faf1655f03ac758942d5b009354ad (diff) | |
| parent | 196e41e4aec1a44ec5b6e9bed485185ba872ae67 (diff) | |
| download | emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.tar.gz emacs-8d0eb4c275581847990b85dbb350caa3df9e653f.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/rcirc.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 6a912cd6273..f6981aeabd9 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -979,6 +979,7 @@ This number is independent of the number of lines in the buffer.") | |||
| 979 | (set (make-local-variable 'rcirc-recent-quit-alist) nil) | 979 | (set (make-local-variable 'rcirc-recent-quit-alist) nil) |
| 980 | (set (make-local-variable 'rcirc-current-line) 0) | 980 | (set (make-local-variable 'rcirc-current-line) 0) |
| 981 | 981 | ||
| 982 | (use-hard-newlines t) | ||
| 982 | (set (make-local-variable 'rcirc-short-buffer-name) nil) | 983 | (set (make-local-variable 'rcirc-short-buffer-name) nil) |
| 983 | (set (make-local-variable 'rcirc-urls) nil) | 984 | (set (make-local-variable 'rcirc-urls) nil) |
| 984 | 985 | ||