(underline nil)
(strikethrough nil)
(prev-point (point)))
- (while (re-search-forward (rx (any "\x02\x1D\x1F\x1E")) nil t)
+ (while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F")
+ (: "\x03" (+ digit) (opt "," (* digit))))) nil t)
(let ((beg (+ (match-beginning 0) 1)))
(if bold
(add-face-text-property prev-point beg '(:weight bold)))
("\x02" (setq bold (not bold)))
("\x1D" (setq italics (not italics)))
("\x1F" (setq underline (not underline)))
- ("\x1E" (setq strikethrough (not strikethrough))))
+ ("\x1E" (setq strikethrough (not strikethrough)))
+ ("\x0F" ; Reset
+ (setq bold nil)
+ (setq italics nil)
+ (setq underline nil)
+ (setq strikethrough nil))
+ (_))
(delete-region (match-beginning 0) (match-end 0))
(setq prev-point (point)))))
(buffer-string)))
("QUIT" "Disconnect from current network." lurk-command-quit)
("NICK" "Change nick." lurk-command-nick)
("LIST" "Display details of one or more channels." lurk-command-list)
- ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions))
+ ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions)
+ ("HELP" "Display help on client commands." lurk-command-help lurk-help-completions))
"Table of commands explicitly supported by Lurk.")
(defun lurk-boolean-completions ()
(defun lurk-context-completions ()
(lurk-get-context-list))
+(defun lurk-help-completions ()
+ (mapcar (lambda (row) (car row)) lurk-command-table))
+
+(defun lurk-command-help (params)
+ (if params
+ (let* ((cmd-str (upcase (car params)))
+ (row (assoc cmd-str lurk-command-table #'equal)))
+ (if row
+ (progn
+ (lurk-display-notice nil "Help for \x02" cmd-str "\x02:")
+ (lurk-display-notice nil " " (elt row 1)))
+ (lurk-display-notice nil "No such (client-interpreted) command.")))
+ (lurk-display-notice nil "Client-interpreted commands:")
+ (dolist (row lurk-command-table)
+ (lurk-display-notice nil " \x02" (elt row 0) "\x02: " (elt row 1)))
+ (lurk-display-notice nil "Use /HELP COMMAND to display information about a specific command.")))
;;; Command entering
;;
(re-search-backward " " lurk-input-marker t)))
(table-row (assoc (upcase cmd-str) lurk-command-table #'equal)))
(if (and table-row (elt table-row 3))
- (let ((completions (funcall (elt table-row 3))))
+ (let* ((completions-nospace (funcall (elt table-row 3)))
+ (completions (mapcar (lambda (el) (concat el " ")) completions-nospace)))
(completion-in-region (+ 1 space-idx) (point) completions)))))
((rx (: "/" (* (not whitespace)) string-end))
(message (buffer-substring lurk-input-marker (point)))
(completion-in-region lurk-input-marker (point)
- (mapcar (lambda (row) (string-join (list "/" (car row))))
+ (mapcar (lambda (row) (concat "/" (car row) " "))
lurk-command-table)))
(_
(let* ((end (max lurk-input-marker (point)))