diff options
| author | Juanma Barranquero | 2006-11-24 10:33:22 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-11-24 10:33:22 +0000 |
| commit | 92c4adc1e2d5be00638f4b49da0cfae962a1de66 (patch) | |
| tree | b6592b75980e83b90e929319f65e822cb3878b37 | |
| parent | db9cd97ad4957831331b4ef2ad79dd20545f67a8 (diff) | |
| download | emacs-92c4adc1e2d5be00638f4b49da0cfae962a1de66.tar.gz emacs-92c4adc1e2d5be00638f4b49da0cfae962a1de66.zip | |
(rcirc-buffer-maximum-lines): Fix space/tab mixup in docstring.
| -rw-r--r-- | lisp/net/rcirc.el | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index a639afeecf8..20305f2dacf 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | ;; This file is distributed in the hope that it will be useful, | 16 | ;; This file is distributed in the hope that it will be useful, |
| 17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 18 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 18 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 19 | ;; GNU General Public License for more details. | 19 | ;; GNU General Public License for more details. |
| 20 | 20 | ||
| 21 | ;; You should have received a copy of the GNU General Public License | 21 | ;; You should have received a copy of the GNU General Public License |
| @@ -137,7 +137,7 @@ Used as the first arg to `format-time-string'." | |||
| 137 | (defcustom rcirc-buffer-maximum-lines nil | 137 | (defcustom rcirc-buffer-maximum-lines nil |
| 138 | "*The maximum size in lines for rcirc buffers. | 138 | "*The maximum size in lines for rcirc buffers. |
| 139 | Channel buffers are truncated from the top to be no greater than this | 139 | Channel buffers are truncated from the top to be no greater than this |
| 140 | number. If zero or nil, no truncating is done." | 140 | number. If zero or nil, no truncating is done." |
| 141 | :type '(choice (const :tag "No truncation" nil) | 141 | :type '(choice (const :tag "No truncation" nil) |
| 142 | (integer :tag "Number of lines")) | 142 | (integer :tag "Number of lines")) |
| 143 | :group 'rcirc) | 143 | :group 'rcirc) |
| @@ -341,12 +341,12 @@ If ARG is non-nil, prompt for a server to connect to." | |||
| 341 | (when (string= rcirc-default-server (process-name p)) | 341 | (when (string= rcirc-default-server (process-name p)) |
| 342 | (setq connected p))) | 342 | (setq connected p))) |
| 343 | (if (not connected) | 343 | (if (not connected) |
| 344 | (rcirc-connect rcirc-default-server rcirc-default-port | 344 | (rcirc-connect rcirc-default-server rcirc-default-port |
| 345 | rcirc-default-nick rcirc-default-user-name | 345 | rcirc-default-nick rcirc-default-user-name |
| 346 | rcirc-default-user-full-name | 346 | rcirc-default-user-full-name |
| 347 | (rcirc-startup-channels rcirc-default-server)) | 347 | (rcirc-startup-channels rcirc-default-server)) |
| 348 | (switch-to-buffer (process-buffer connected)) | 348 | (switch-to-buffer (process-buffer connected)) |
| 349 | (message "Connected to %s" | 349 | (message "Connected to %s" |
| 350 | (process-contact (get-buffer-process (current-buffer)) | 350 | (process-contact (get-buffer-process (current-buffer)) |
| 351 | :host)))))) | 351 | :host)))))) |
| 352 | ;;;###autoload | 352 | ;;;###autoload |
| @@ -569,7 +569,7 @@ With no argument or nil as argument, use the current buffer." | |||
| 569 | 569 | ||
| 570 | (defun rcirc-nick (process) | 570 | (defun rcirc-nick (process) |
| 571 | "Return PROCESS nick." | 571 | "Return PROCESS nick." |
| 572 | (with-rcirc-process-buffer process | 572 | (with-rcirc-process-buffer process |
| 573 | (or rcirc-nick rcirc-default-nick))) | 573 | (or rcirc-nick rcirc-default-nick))) |
| 574 | 574 | ||
| 575 | (defun rcirc-buffer-nick (&optional buffer) | 575 | (defun rcirc-buffer-nick (&optional buffer) |
| @@ -970,7 +970,7 @@ Create the buffer if it doesn't exist." | |||
| 970 | 970 | ||
| 971 | (defvar rcirc-multiline-minor-mode-map (make-sparse-keymap) | 971 | (defvar rcirc-multiline-minor-mode-map (make-sparse-keymap) |
| 972 | "Keymap for multiline mode in rcirc.") | 972 | "Keymap for multiline mode in rcirc.") |
| 973 | (define-key rcirc-multiline-minor-mode-map | 973 | (define-key rcirc-multiline-minor-mode-map |
| 974 | (kbd "C-c C-c") 'rcirc-multiline-minor-submit) | 974 | (kbd "C-c C-c") 'rcirc-multiline-minor-submit) |
| 975 | (define-key rcirc-multiline-minor-mode-map | 975 | (define-key rcirc-multiline-minor-mode-map |
| 976 | (kbd "C-x C-s") 'rcirc-multiline-minor-submit) | 976 | (kbd "C-x C-s") 'rcirc-multiline-minor-submit) |
| @@ -1079,7 +1079,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'." | |||
| 1079 | "%") | 1079 | "%") |
| 1080 | ((or (eq key ?n) (eq key ?N)) | 1080 | ((or (eq key ?n) (eq key ?N)) |
| 1081 | ;; %n/%N -- nick | 1081 | ;; %n/%N -- nick |
| 1082 | (let ((nick (concat (if (string= (with-rcirc-process-buffer | 1082 | (let ((nick (concat (if (string= (with-rcirc-process-buffer |
| 1083 | process | 1083 | process |
| 1084 | rcirc-server) | 1084 | rcirc-server) |
| 1085 | sender) | 1085 | sender) |
| @@ -1092,7 +1092,7 @@ is found by looking up RESPONSE in `rcirc-response-formats'." | |||
| 1092 | (cond ((string= sender (rcirc-nick process)) | 1092 | (cond ((string= sender (rcirc-nick process)) |
| 1093 | 'rcirc-my-nick) | 1093 | 'rcirc-my-nick) |
| 1094 | ((and rcirc-bright-nicks | 1094 | ((and rcirc-bright-nicks |
| 1095 | (string-match | 1095 | (string-match |
| 1096 | (regexp-opt rcirc-bright-nicks) | 1096 | (regexp-opt rcirc-bright-nicks) |
| 1097 | sender)) | 1097 | sender)) |
| 1098 | 'rcirc-bright-nick) | 1098 | 'rcirc-bright-nick) |
| @@ -1206,7 +1206,7 @@ record activity." | |||
| 1206 | 1206 | ||
| 1207 | (let ((text-start (make-marker))) | 1207 | (let ((text-start (make-marker))) |
| 1208 | (set-marker text-start | 1208 | (set-marker text-start |
| 1209 | (or (next-single-property-change fill-start | 1209 | (or (next-single-property-change fill-start |
| 1210 | 'rcirc-text) | 1210 | 'rcirc-text) |
| 1211 | rcirc-prompt-end-marker)) | 1211 | rcirc-prompt-end-marker)) |
| 1212 | ;; squeeze spaces out of text before rcirc-text | 1212 | ;; squeeze spaces out of text before rcirc-text |
| @@ -1402,7 +1402,7 @@ if NICK is also on `rcirc-ignore-list-automatic'." | |||
| 1402 | (append global-mode-string '(rcirc-activity-string)))) | 1402 | (append global-mode-string '(rcirc-activity-string)))) |
| 1403 | (add-hook 'window-configuration-change-hook | 1403 | (add-hook 'window-configuration-change-hook |
| 1404 | 'rcirc-window-configuration-change)) | 1404 | 'rcirc-window-configuration-change)) |
| 1405 | (setq global-mode-string | 1405 | (setq global-mode-string |
| 1406 | (delete 'rcirc-activity-string global-mode-string)) | 1406 | (delete 'rcirc-activity-string global-mode-string)) |
| 1407 | (remove-hook 'window-configuration-change-hook | 1407 | (remove-hook 'window-configuration-change-hook |
| 1408 | 'rcirc-window-configuration-change))) | 1408 | 'rcirc-window-configuration-change))) |
| @@ -1461,7 +1461,7 @@ show the buffer." | |||
| 1461 | (interactive "P") | 1461 | (interactive "P") |
| 1462 | (let* ((pair (rcirc-split-activity rcirc-activity)) | 1462 | (let* ((pair (rcirc-split-activity rcirc-activity)) |
| 1463 | (lopri (car pair)) | 1463 | (lopri (car pair)) |
| 1464 | (hipri (cdr pair))) | 1464 | (hipri (cdr pair))) |
| 1465 | (if (or (and (not arg) hipri) | 1465 | (if (or (and (not arg) hipri) |
| 1466 | (and arg lopri)) | 1466 | (and arg lopri)) |
| 1467 | (progn | 1467 | (progn |
| @@ -1476,10 +1476,10 @@ show the buffer." | |||
| 1476 | (message "No more IRC activity. Go back to work.") | 1476 | (message "No more IRC activity. Go back to work.") |
| 1477 | (funcall rcirc-switch-to-buffer-function rcirc-last-non-irc-buffer) | 1477 | (funcall rcirc-switch-to-buffer-function rcirc-last-non-irc-buffer) |
| 1478 | (setq rcirc-last-non-irc-buffer nil)) | 1478 | (setq rcirc-last-non-irc-buffer nil)) |
| 1479 | (message (concat | 1479 | (message (concat |
| 1480 | "No IRC activity." | 1480 | "No IRC activity." |
| 1481 | (when lopri | 1481 | (when lopri |
| 1482 | (concat | 1482 | (concat |
| 1483 | " Type C-u " | 1483 | " Type C-u " |
| 1484 | (key-description (this-command-keys)) | 1484 | (key-description (this-command-keys)) |
| 1485 | " for low priority activity.")))))))) | 1485 | " for low priority activity.")))))))) |
| @@ -1669,7 +1669,7 @@ Also, clear the overlay arrow if the current buffer is now hidden." | |||
| 1669 | (if (null message) | 1669 | (if (null message) |
| 1670 | (progn | 1670 | (progn |
| 1671 | (setq target (completing-read "Message nick: " | 1671 | (setq target (completing-read "Message nick: " |
| 1672 | (with-rcirc-server-buffer | 1672 | (with-rcirc-server-buffer |
| 1673 | rcirc-nick-table))) | 1673 | rcirc-nick-table))) |
| 1674 | (when (> (length target) 0) | 1674 | (when (> (length target) 0) |
| 1675 | (setq message (read-string (format "Message %s: " target))) | 1675 | (setq message (read-string (format "Message %s: " target))) |
| @@ -1775,7 +1775,7 @@ With a prefix arg, prompt for new topic." | |||
| 1775 | "Kick NICK from current channel." | 1775 | "Kick NICK from current channel." |
| 1776 | (interactive (list | 1776 | (interactive (list |
| 1777 | (concat (completing-read "Kick nick: " | 1777 | (concat (completing-read "Kick nick: " |
| 1778 | (rcirc-channel-nicks | 1778 | (rcirc-channel-nicks |
| 1779 | (rcirc-buffer-process) | 1779 | (rcirc-buffer-process) |
| 1780 | rcirc-target)) | 1780 | rcirc-target)) |
| 1781 | (read-from-minibuffer "Kick reason: ")))) | 1781 | (read-from-minibuffer "Kick reason: ")))) |
| @@ -1812,7 +1812,7 @@ nicks when no NICK is given. When listing ignored nicks, the | |||
| 1812 | ones added to the list automatically are marked with an asterisk." | 1812 | ones added to the list automatically are marked with an asterisk." |
| 1813 | (interactive "sToggle ignoring of nick: ") | 1813 | (interactive "sToggle ignoring of nick: ") |
| 1814 | (setq rcirc-ignore-list (rcirc-add-or-remove rcirc-ignore-list nick)) | 1814 | (setq rcirc-ignore-list (rcirc-add-or-remove rcirc-ignore-list nick)) |
| 1815 | (rcirc-print process nil "IGNORE" target | 1815 | (rcirc-print process nil "IGNORE" target |
| 1816 | (mapconcat | 1816 | (mapconcat |
| 1817 | (lambda (nick) | 1817 | (lambda (nick) |
| 1818 | (concat nick | 1818 | (concat nick |
| @@ -1824,14 +1824,14 @@ ones added to the list automatically are marked with an asterisk." | |||
| 1824 | "Manage the bright nick list." | 1824 | "Manage the bright nick list." |
| 1825 | (interactive "sToggle emphasis of nick: ") | 1825 | (interactive "sToggle emphasis of nick: ") |
| 1826 | (setq rcirc-bright-nicks (rcirc-add-or-remove rcirc-bright-nicks nick)) | 1826 | (setq rcirc-bright-nicks (rcirc-add-or-remove rcirc-bright-nicks nick)) |
| 1827 | (rcirc-print process nil "BRIGHT" target | 1827 | (rcirc-print process nil "BRIGHT" target |
| 1828 | (mapconcat 'identity rcirc-bright-nicks " "))) | 1828 | (mapconcat 'identity rcirc-bright-nicks " "))) |
| 1829 | 1829 | ||
| 1830 | (defun-rcirc-command dim (nick) | 1830 | (defun-rcirc-command dim (nick) |
| 1831 | "Manage the dim nick list." | 1831 | "Manage the dim nick list." |
| 1832 | (interactive "sToggle deemphasis of nick: ") | 1832 | (interactive "sToggle deemphasis of nick: ") |
| 1833 | (setq rcirc-dim-nicks (rcirc-add-or-remove rcirc-dim-nicks nick)) | 1833 | (setq rcirc-dim-nicks (rcirc-add-or-remove rcirc-dim-nicks nick)) |
| 1834 | (rcirc-print process nil "DIM" target | 1834 | (rcirc-print process nil "DIM" target |
| 1835 | (mapconcat 'identity rcirc-dim-nicks " "))) | 1835 | (mapconcat 'identity rcirc-dim-nicks " "))) |
| 1836 | 1836 | ||
| 1837 | (defun-rcirc-command keyword (keyword) | 1837 | (defun-rcirc-command keyword (keyword) |
| @@ -1840,7 +1840,7 @@ Mark KEYWORD, unmark KEYWORD if already marked, or list marked | |||
| 1840 | keywords when no KEYWORD is given." | 1840 | keywords when no KEYWORD is given." |
| 1841 | (interactive "sToggle highlighting of keyword: ") | 1841 | (interactive "sToggle highlighting of keyword: ") |
| 1842 | (setq rcirc-keywords (rcirc-add-or-remove rcirc-keywords keyword)) | 1842 | (setq rcirc-keywords (rcirc-add-or-remove rcirc-keywords keyword)) |
| 1843 | (rcirc-print process nil "KEYWORD" target | 1843 | (rcirc-print process nil "KEYWORD" target |
| 1844 | (mapconcat 'identity rcirc-keywords " "))) | 1844 | (mapconcat 'identity rcirc-keywords " "))) |
| 1845 | 1845 | ||
| 1846 | 1846 | ||
| @@ -1865,8 +1865,8 @@ keywords when no KEYWORD is given." | |||
| 1865 | (defvar rcirc-url-regexp | 1865 | (defvar rcirc-url-regexp |
| 1866 | (rx-to-string | 1866 | (rx-to-string |
| 1867 | `(and word-boundary | 1867 | `(and word-boundary |
| 1868 | (or (and | 1868 | (or (and |
| 1869 | (or (and (or "http" "https" "ftp" "file" "gopher" "news" | 1869 | (or (and (or "http" "https" "ftp" "file" "gopher" "news" |
| 1870 | "telnet" "wais" "mailto") | 1870 | "telnet" "wais" "mailto") |
| 1871 | "://") | 1871 | "://") |
| 1872 | "www.") | 1872 | "www.") |
| @@ -1876,7 +1876,7 @@ keywords when no KEYWORD is given." | |||
| 1876 | (and (1+ (char "-a-zA-Z0-9_.")) | 1876 | (and (1+ (char "-a-zA-Z0-9_.")) |
| 1877 | (or ".com" ".net" ".org") | 1877 | (or ".com" ".net" ".org") |
| 1878 | word-boundary)) | 1878 | word-boundary)) |
| 1879 | (optional | 1879 | (optional |
| 1880 | (and "/" | 1880 | (and "/" |
| 1881 | (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]()")) | 1881 | (1+ (char "-a-zA-Z0-9_=!?#$\@~`%&*+|\\/:;.,{}[]()")) |
| 1882 | (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]()"))))) | 1882 | (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]()"))))) |
| @@ -1957,11 +1957,11 @@ in this buffer.") | |||
| 1957 | 1957 | ||
| 1958 | (defun rcirc-markup-my-nick (process sender response channel-buffer) | 1958 | (defun rcirc-markup-my-nick (process sender response channel-buffer) |
| 1959 | (with-syntax-table rcirc-nick-syntax-table | 1959 | (with-syntax-table rcirc-nick-syntax-table |
| 1960 | (while (re-search-forward (concat "\\b" | 1960 | (while (re-search-forward (concat "\\b" |
| 1961 | (regexp-quote (rcirc-nick process)) | 1961 | (regexp-quote (rcirc-nick process)) |
| 1962 | "\\b") | 1962 | "\\b") |
| 1963 | nil t) | 1963 | nil t) |
| 1964 | (rcirc-add-face (match-beginning 0) (match-end 0) | 1964 | (rcirc-add-face (match-beginning 0) (match-end 0) |
| 1965 | 'rcirc-nick-in-message) | 1965 | 'rcirc-nick-in-message) |
| 1966 | (when (string= response "PRIVMSG") | 1966 | (when (string= response "PRIVMSG") |
| 1967 | (rcirc-add-face (point-min) (point-max) 'rcirc-nick-in-message-full-line) | 1967 | (rcirc-add-face (point-min) (point-max) 'rcirc-nick-in-message-full-line) |
| @@ -2409,7 +2409,7 @@ Passwords are stored in `rcirc-authinfo' (which see)." | |||
| 2409 | (defface rcirc-nick-in-message-full-line | 2409 | (defface rcirc-nick-in-message-full-line |
| 2410 | '((t (:bold t))) | 2410 | '((t (:bold t))) |
| 2411 | "The face used emphasize the entire message when your nick is mentioned." | 2411 | "The face used emphasize the entire message when your nick is mentioned." |
| 2412 | :group 'rcirc-faces) | 2412 | :group 'rcirc-faces) |
| 2413 | 2413 | ||
| 2414 | (defface rcirc-prompt ; comint-highlight-prompt | 2414 | (defface rcirc-prompt ; comint-highlight-prompt |
| 2415 | '((((min-colors 88) (background dark)) (:foreground "cyan1")) | 2415 | '((((min-colors 88) (background dark)) (:foreground "cyan1")) |