Mercurial > emacs
comparison lisp/simple.el @ 83644:0ece58f6e0aa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 15 Jul 2007 02:05:20 +0000 |
parents | 0a3247aa24a4 d50de52ebdfb |
children | fd5b4a865d1d |
comparison
equal
deleted
inserted
replaced
83643:70b38dec13a1 | 83644:0ece58f6e0aa |
---|---|
141 (const :tag "Semipermanent highlighting" t) | 141 (const :tag "Semipermanent highlighting" t) |
142 (const :tag "No highlighting" nil) | 142 (const :tag "No highlighting" nil) |
143 (const :tag "Fringe arrow" fringe-arrow)) | 143 (const :tag "Fringe arrow" fringe-arrow)) |
144 :group 'next-error | 144 :group 'next-error |
145 :version "22.1") | 145 :version "22.1") |
146 | |
147 (defcustom next-error-recenter nil | |
148 "*Display the line in the visited source file recentered as specified. | |
149 If non-nil, the value is passed directly to `recenter'." | |
150 :type '(choice (integer :tag "Line to recenter to") | |
151 (const :tag "Center of window" (4)) | |
152 (const :tag "No recentering" nil)) | |
153 :group 'next-error | |
154 :version "23.1") | |
146 | 155 |
147 (defcustom next-error-hook nil | 156 (defcustom next-error-hook nil |
148 "*List of hook functions run by `next-error' after visiting source file." | 157 "*List of hook functions run by `next-error' after visiting source file." |
149 :type 'hook | 158 :type 'hook |
150 :group 'next-error) | 159 :group 'next-error) |
291 (if (consp arg) (setq reset t arg nil)) | 300 (if (consp arg) (setq reset t arg nil)) |
292 (when (setq next-error-last-buffer (next-error-find-buffer)) | 301 (when (setq next-error-last-buffer (next-error-find-buffer)) |
293 ;; we know here that next-error-function is a valid symbol we can funcall | 302 ;; we know here that next-error-function is a valid symbol we can funcall |
294 (with-current-buffer next-error-last-buffer | 303 (with-current-buffer next-error-last-buffer |
295 (funcall next-error-function (prefix-numeric-value arg) reset) | 304 (funcall next-error-function (prefix-numeric-value arg) reset) |
305 (when next-error-recenter | |
306 (recenter next-error-recenter)) | |
296 (run-hooks 'next-error-hook)))) | 307 (run-hooks 'next-error-hook)))) |
297 | 308 |
298 (defun next-error-internal () | 309 (defun next-error-internal () |
299 "Visit the source code corresponding to the `next-error' message at point." | 310 "Visit the source code corresponding to the `next-error' message at point." |
300 (setq next-error-last-buffer (current-buffer)) | 311 (setq next-error-last-buffer (current-buffer)) |
301 ;; we know here that next-error-function is a valid symbol we can funcall | 312 ;; we know here that next-error-function is a valid symbol we can funcall |
302 (with-current-buffer next-error-last-buffer | 313 (with-current-buffer next-error-last-buffer |
303 (funcall next-error-function 0 nil) | 314 (funcall next-error-function 0 nil) |
315 (when next-error-recenter | |
316 (recenter next-error-recenter)) | |
304 (run-hooks 'next-error-hook))) | 317 (run-hooks 'next-error-hook))) |
305 | 318 |
306 (defalias 'goto-next-locus 'next-error) | 319 (defalias 'goto-next-locus 'next-error) |
307 (defalias 'next-match 'next-error) | 320 (defalias 'next-match 'next-error) |
308 | 321 |
2175 display args) | 2188 display args) |
2176 (when stderr-file (copy-file stderr-file (cadr buffer))))) | 2189 (when stderr-file (copy-file stderr-file (cadr buffer))))) |
2177 (when stderr-file (delete-file stderr-file)) | 2190 (when stderr-file (delete-file stderr-file)) |
2178 (when lc (delete-file lc))))) | 2191 (when lc (delete-file lc))))) |
2179 | 2192 |
2193 (defun start-file-process (name buffer program &rest program-args) | |
2194 "Start a program in a subprocess. Return the process object for it. | |
2195 Similar to `start-process', but may invoke a file handler based on | |
2196 `default-directory'. The current working directory of the | |
2197 subprocess is `default-directory'. | |
2198 | |
2199 PROGRAM and PROGRAM-ARGS might be file names. They are not | |
2200 objects of file handler invocation." | |
2201 (let ((fh (find-file-name-handler default-directory 'start-file-process))) | |
2202 (if fh (apply fh 'start-file-process name buffer program program-args) | |
2203 (apply 'start-process name buffer program program-args)))) | |
2204 | |
2180 | 2205 |
2181 | 2206 |
2182 (defvar universal-argument-map | 2207 (defvar universal-argument-map |
2183 (let ((map (make-sparse-keymap))) | 2208 (let ((map (make-sparse-keymap))) |
2184 (define-key map [t] 'universal-argument-other-key) | 2209 (define-key map [t] 'universal-argument-other-key) |
5236 (define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier) | 5261 (define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier) |
5237 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier) | 5262 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier) |
5238 | 5263 |
5239 ;;;; Keypad support. | 5264 ;;;; Keypad support. |
5240 | 5265 |
5241 ;;; Make the keypad keys act like ordinary typing keys. If people add | 5266 ;; Make the keypad keys act like ordinary typing keys. If people add |
5242 ;;; bindings for the function key symbols, then those bindings will | 5267 ;; bindings for the function key symbols, then those bindings will |
5243 ;;; override these, so this shouldn't interfere with any existing | 5268 ;; override these, so this shouldn't interfere with any existing |
5244 ;;; bindings. | 5269 ;; bindings. |
5245 | 5270 |
5246 ;; Also tell read-char how to handle these keys. | 5271 ;; Also tell read-char how to handle these keys. |
5247 (mapc | 5272 (mapc |
5248 (lambda (keypad-normal) | 5273 (lambda (keypad-normal) |
5249 (let ((keypad (nth 0 keypad-normal)) | 5274 (let ((keypad (nth 0 keypad-normal)) |