;; Buffer Local Variables:
;;============================================================================
;; Comint mode buffer local variables:
-;; comint-prompt-regexp - string comint-bol uses to match prompt
-;; comint-delimiter-argument-list - list For delimiters and arguments
-;; comint-last-input-start - marker Handy if inferior always echoes
-;; comint-last-input-end - marker For comint-kill-output command
-;; comint-input-ring-size - integer For the input history
-;; comint-input-ring - ring mechanism
-;; comint-input-ring-index - number ...
-;; comint-input-autoexpand - symbol ...
-;; comint-input-ignoredups - boolean ...
-;; comint-last-input-match - string ...
-;; comint-dynamic-complete-functions - hook For the completion mechanism
-;; comint-completion-fignore - list ...
-;; comint-file-name-quote-list - list ...
-;; comint-get-old-input - function Hooks for specific
-;; comint-input-filter-functions - hook process-in-a-buffer
-;; comint-output-filter-functions - hook function modes.
-;; comint-input-filter - function ...
-;; comint-input-sender - function ...
-;; comint-eol-on-send - boolean ...
-;; comint-process-echoes - boolean ...
-;; comint-scroll-to-bottom-on-input - symbol For scroll behavior
-;; comint-scroll-to-bottom-on-output - symbol ...
-;; comint-scroll-show-maximum-output - boolean...
+;; comint-prompt-regexp string comint-bol uses to match prompt
+;; comint-delimiter-argument-list list For delimiters and arguments
+;; comint-last-input-start marker Handy if inferior always echoes
+;; comint-last-input-end marker For comint-kill-output command
+;; comint-input-ring-size integer For the input history
+;; comint-input-ring ring mechanism
+;; comint-input-ring-index number ...
+;; comint-input-autoexpand symbol ...
+;; comint-input-ignoredups boolean ...
+;; comint-last-input-match string ...
+;; comint-dynamic-complete-functions hook For the completion mechanism
+;; comint-completion-fignore list ...
+;; comint-file-name-regexp regexp ...
+;; comint-file-name-quote-list list ...
+;; comint-get-old-input function Hooks for specific
+;; comint-input-filter-functions hook process-in-a-buffer
+;; comint-output-filter-functions hook function modes.
+;; comint-input-filter function ...
+;; comint-input-sender function ...
+;; comint-eol-on-send boolean ...
+;; comint-process-echoes boolean ...
+;; comint-scroll-to-bottom-on-input symbol For scroll behavior
+;; comint-scroll-to-bottom-on-output symbol ...
+;; comint-scroll-show-maximum-output boolean ...
;;
;; Comint mode non-buffer local variables:
-;; comint-completion-addsuffix - boolean/cons For file name completion
-;; comint-completion-autolist - boolean behavior
-;; comint-completion-recexact - boolean ...
+;; comint-completion-addsuffix boolean/cons For file name
+;; comint-completion-autolist boolean completion behavior
+;; comint-completion-recexact boolean ...
(defvar comint-prompt-regexp "^"
"Regexp to recognise prompts in the inferior process.
(defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom)
"Functions to call after output is inserted into the buffer.
One possible function is `comint-postoutput-scroll-to-bottom'.
-These functions get one argument, a string containing the text just inserted.
+These functions get one argument, a string containing the text as originally
+inserted. Note that this might not be the same as the buffer contents between
+`comint-last-output-start' and the buffer's `process-mark', if other filter
+functions have already modified the buffer.
This variable is buffer-local.")
(make-local-variable 'comint-ptyp)
(make-local-variable 'comint-exec-hook)
(make-local-variable 'comint-process-echoes)
+ (make-local-variable 'comint-file-name-regexp)
(make-local-variable 'comint-file-name-quote-list)
(run-hooks 'comint-mode-hook))
Returns t if successful."
(interactive)
(if (and comint-input-autoexpand
- (string-match "[!^]" (funcall comint-get-old-input))
+ (string-match "!\\|^\\^" (funcall comint-get-old-input))
(save-excursion (beginning-of-line)
(looking-at comint-prompt-regexp)))
;; Looks like there might be history references in the command.
(select-window window)
(if (and (< (point) (process-mark process))
(or (eq scroll t) (eq scroll 'all)
- ;; Maybe user wants point to jump to the end.
+ ;; Maybe user wants point to jump to end.
(and (eq scroll 'this) (eq selected window))
(and (eq scroll 'others) (not (eq selected window)))
- ;; If point was at the end, keep it at the end.
- (>= (point)
- (- (process-mark process) (length string)))))
+ ;; If point was at the end, keep it at end.
+ (>= (point) comint-last-output-start)))
(goto-char (process-mark process)))
;; Optionally scroll so that the text
;; ends at the bottom of the window.
This function could be on `comint-output-filter-functions' or bound to a key."
(interactive)
(save-excursion
- (goto-char (point-max))
+ (goto-char (process-mark (get-buffer-process (current-buffer))))
(forward-line (- comint-buffer-maximum-size))
(beginning-of-line)
(delete-region (point-min) (point))))
This is used by comint's and shell's completion functions, and by shell's
directory tracking functions.")
+(defvar comint-file-name-regexp nil
+ "Regexp of characters valid in a file name.
+
+This is a good thing to set in mode hooks.")
+
(defvar comint-file-name-quote-list nil
"List of characters to quote with `\\' when in a file name.
(defun comint-match-partial-filename ()
"Return the filename at point, or nil if non is found.
Environment variables are substituted. See `comint-word'."
- (let ((filename (comint-word "~/A-Za-z0-9+@:_.$#%,={}-")))
+ (let ((filename (comint-word comint-file-name-regexp)))
(and filename (comint-substitute-in-file-name
(comint-unquote-filename filename)))))
Returns t if successful."
(interactive)
(if (comint-match-partial-filename)
- (let ((directory-sep-char ?/))
- (if (memq system-type '(ms-dos windows-nt))
- ; The default shells on these systems require backslashed names
- (setq directory-sep-char ?\\))
+ (let ((directory-sep-char (if (memq system-type '(ms-dos windows-nt))
+ ?\\
+ ?/)))
(prog2 (or (window-minibuffer-p (selected-window))
(message "Completing file name..."))
(comint-dynamic-complete-as-filename)))))
(defun comint-dynamic-complete-as-filename ()
"Dynamically complete at point as a filename.
See `comint-dynamic-complete-filename'. Returns t if successful."
- (let* ((completion-ignore-case
- (if (memq system-type '(ms-dos windows-nt)) t nil))
+ (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
(completion-ignored-extensions comint-completion-fignore)
- (file-name-handler-alist nil)
+ ;; If we bind this, it breaks remote directory tracking in rlogin.el.
+ ;; I think it was originally bound to solve file completion problems,
+ ;; but subsequent changes may have made this unnecessary. sm.
+ ;;(file-name-handler-alist nil)
(minibuffer-p (window-minibuffer-p (selected-window)))
(success t)
(dirsuffix (cond ((not comint-completion-addsuffix) "")
Returns `listed' if a completion listing was shown.
See also `comint-dynamic-complete-filename'."
- (let* ((completion-ignore-case
- (if (memq system-type '(ms-dos windows-nt)) t nil))
+ (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
(suffix (cond ((not comint-completion-addsuffix) "")
((not (consp comint-completion-addsuffix)) " ")
(t (cdr comint-completion-addsuffix))))
(defun comint-dynamic-list-filename-completions ()
"List in help buffer possible completions of the filename at point."
(interactive)
- (let* ((completion-ignore-case
- (if (memq system-type '(ms-dos windows-nt)) t nil))
- (file-name-handler-alist nil)
+ (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt)))
+ ;; If we bind this, it breaks remote directory tracking in rlogin.el.
+ ;; I think it was originally bound to solve file completion problems,
+ ;; but subsequent changes may have made this unnecessary. sm.
+ ;;(file-name-handler-alist nil)
(filename (or (comint-match-partial-filename) ""))
(pathdir (file-name-directory filename))
(pathnondir (file-name-nondirectory filename))
projects / emacs.git / commitdiff