Changeset 4140 for trunk/lisp/erc/erc.el
- Timestamp:
- 08/10/06 11:19:54 (2 years ago)
- Files:
-
- trunk/lisp/erc/erc.el (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lisp/erc/erc.el
r4111 r4140 68 68 ;;; Code: 69 69 70 (defconst erc-version-string "Version 5.1. 3"70 (defconst erc-version-string "Version 5.1.4" 71 71 "ERC version. This is used by function `erc-version'.") 72 72 … … 158 158 :group 'erc 159 159 :type '(choice (const :tag "None" nil) 160 ( const :tag "Port number" number)161 ( const :tag "Port string" string)))160 (integer :tag "Port number") 161 (string :tag "Port string"))) 162 162 163 163 (defcustom erc-nick nil … … 823 823 824 824 (defcustom erc-startup-file-list 825 '("~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc") 825 '("~/.emacs.d/.ercrc.el" "~/.emacs.d/.ercrc" 826 "~/.ercrc.el" "~/.ercrc" ".ercrc.el" ".ercrc") 826 827 "List of files to try for a startup script. 827 828 The first existent and readable one will get executed. … … 1244 1245 (downcase (symbol-name alias))))) 1245 1246 (quote 1246 ,mode)))))) 1247 ,mode))) 1248 ;; For find-function and find-variable. 1249 (put ',mode 'definition-name ',name) 1250 (put ',enable 'definition-name ',name) 1251 (put ',disable 'definition-name ',name)))) 1247 1252 1248 1253 (put 'define-erc-module 'doc-string-elt 3) … … 1389 1394 (with-current-buffer (erc-server-buffer) 1390 1395 (if (buffer-live-p erc-active-buffer) 1391 erc-active-buffer )1392 (setq erc-active-buffer (current-buffer))))1396 erc-active-buffer 1397 (setq erc-active-buffer (current-buffer))))) 1393 1398 1394 1399 (defun erc-set-active-buffer (buffer) … … 2359 2364 (setq string 2360 2365 (cond 2366 ((null type) 2367 string) 2361 2368 ((listp type) 2362 2369 (mapc (lambda (type) … … 2371 2378 (erc-display-line string buffer) 2372 2379 (unless (member (erc-response.command parsed) erc-hide-list) 2373 2380 (erc-put-text-property 0 (length string) 'erc-parsed parsed string) 2374 2381 (erc-put-text-property 0 (length string) 'rear-sticky t string) 2375 2382 (erc-display-line string buffer))))) … … 5238 5245 "Select an ERC startup file. 5239 5246 See also `erc-startup-file-list'." 5240 (let ((l erc-startup-file-list) 5241 (f nil)) 5242 (while (and (not f) l) 5243 (if (file-readable-p (car l)) 5244 (setq f (car l))) 5245 (setq l (cdr l))) 5246 f)) 5247 (catch 'found 5248 (dolist (f erc-startup-file-list) 5249 (setq f (convert-standard-filename f)) 5250 (when (file-readable-p f) 5251 (throw 'found f))))) 5247 5252 5248 5253 (defun erc-find-script-file (file) … … 5891 5896 (while bufs 5892 5897 (split-window) 5893 (switch-to-buffer-other-window (car bufs)) 5898 (other-window 1) 5899 (switch-to-buffer (car bufs)) 5894 5900 (setq bufs (cdr bufs)) 5895 5901 (balance-windows))))) … … 5943 5949 (ctcp-too-many . "Too many CTCP queries in single message. Ignoring") 5944 5950 (flood-ctcp-off . "FLOOD PROTECTION: Automatic CTCP responses turned off.") 5945 (flood-strict-mode . "FLOOD PROTECTION: Switched to Strict Flood Control mode.") 5946 (disconnected . "Connection failed! Re-establishing connection...") 5947 (disconnected-noreconnect . "Connection failed! Not re-establishing connection.") 5951 (flood-strict-mode 5952 . "FLOOD PROTECTION: Switched to Strict Flood Control mode.") 5953 (disconnected . "\n\nConnection failed! Re-establishing connection...\n") 5954 (disconnected-noreconnect 5955 . "\n\nConnection failed! Not re-establishing connection.\n") 5956 (finished . "\n\n*** ERC finished ***\n") 5957 (terminated . "\n\n*** ERC terminated: %e\n") 5948 5958 (login . "Logging in as \'%n\'...") 5949 5959 (nick-in-use . "%n is in use. Choose new nickname: ") 5950 (nick-too-long . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server") 5960 (nick-too-long 5961 . "WARNING: Nick length (%i) exceeds max NICKLEN(%l) defined by server") 5951 5962 (no-default-channel . "No default channel") 5952 5963 (no-invitation . "You've got no invitation")
