Lines Matching +defs:local +defs:set +defs:key
32 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-merge-directories]
34 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions-with-ancestor]
36 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-revisions]
38 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-files-with-ancestor]
40 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-files]
42 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers-with-ancestor]
44 ;;;###autoload (define-key menu-bar-emerge-menu [emerge-buffers]
67 (set-buffer ,buffer)
69 (set-buffer StartBuffer))))
71 (defmacro emerge-defvar-local (var value doc)
73 Performs a defvar, then executes `make-variable-buffer-local' on
75 `kill-all-local-variables' (called by major-mode setting commands)
79 (make-variable-buffer-local ',var)
181 (defcustom emerge-process-local-variables nil
182 "*Non-nil if Emerge should process local-variables lists in merge buffers.
183 \(You can explicitly request processing the local-variables
184 by executing `(hack-local-variables)'.)"
198 Must be set before Emerge is loaded, or emerge-new-flags must be run
204 Must be set before Emerge is loaded, or emerge-new-flags must be run
212 "*Hook to run in the merge buffer after the merge has been set up."
320 Note that this variable can be made local to a particular merge buffer by
321 giving a prefix argument to `emerge-set-combine-versions-template'."
347 Must be set before Emerge is loaded."
352 ;; Emerge is done to allow the user maximum time to set up the global keymap.
358 (define-key emerge-basic-keymap "p" 'emerge-previous-difference)
359 (define-key emerge-basic-keymap "n" 'emerge-next-difference)
360 (define-key emerge-basic-keymap "a" 'emerge-select-A)
361 (define-key emerge-basic-keymap "b" 'emerge-select-B)
362 (define-key emerge-basic-keymap "j" 'emerge-jump-to-difference)
363 (define-key emerge-basic-keymap "." 'emerge-find-difference)
364 (define-key emerge-basic-keymap "q" 'emerge-quit)
365 (define-key emerge-basic-keymap "\C-]" 'emerge-abort)
366 (define-key emerge-basic-keymap "f" 'emerge-fast-mode)
367 (define-key emerge-basic-keymap "e" 'emerge-edit-mode)
368 (define-key emerge-basic-keymap "s" nil)
369 (define-key emerge-basic-keymap "sa" 'emerge-auto-advance)
370 (define-key emerge-basic-keymap "ss" 'emerge-skip-prefers)
371 (define-key emerge-basic-keymap "l" 'emerge-recenter)
372 (define-key emerge-basic-keymap "d" nil)
373 (define-key emerge-basic-keymap "da" 'emerge-default-A)
374 (define-key emerge-basic-keymap "db" 'emerge-default-B)
375 (define-key emerge-basic-keymap "c" nil)
376 (define-key emerge-basic-keymap "ca" 'emerge-copy-as-kill-A)
377 (define-key emerge-basic-keymap "cb" 'emerge-copy-as-kill-B)
378 (define-key emerge-basic-keymap "i" nil)
379 (define-key emerge-basic-keymap "ia" 'emerge-insert-A)
380 (define-key emerge-basic-keymap "ib" 'emerge-insert-B)
381 (define-key emerge-basic-keymap "m" 'emerge-mark-difference)
382 (define-key emerge-basic-keymap "v" 'emerge-scroll-up)
383 (define-key emerge-basic-keymap "^" 'emerge-scroll-down)
384 (define-key emerge-basic-keymap "<" 'emerge-scroll-left)
385 (define-key emerge-basic-keymap ">" 'emerge-scroll-right)
386 (define-key emerge-basic-keymap "|" 'emerge-scroll-reset)
387 (define-key emerge-basic-keymap "x" nil)
388 (define-key emerge-basic-keymap "x1" 'emerge-one-line-window)
389 (define-key emerge-basic-keymap "xc" 'emerge-combine-versions)
390 (define-key emerge-basic-keymap "xC" 'emerge-combine-versions-register)
391 (define-key emerge-basic-keymap "xf" 'emerge-file-names)
392 (define-key emerge-basic-keymap "xj" 'emerge-join-differences)
393 (define-key emerge-basic-keymap "xl" 'emerge-line-numbers)
394 (define-key emerge-basic-keymap "xm" 'emerge-set-merge-mode)
395 (define-key emerge-basic-keymap "xs" 'emerge-split-difference)
396 (define-key emerge-basic-keymap "xt" 'emerge-trim-difference)
397 (define-key emerge-basic-keymap "xx" 'emerge-set-combine-versions-template)
403 (define-key emerge-fast-keymap emerge-command-prefix 'emerge-basic-keymap)
407 (define-key emerge-fast-keymap [remap write-file] 'emerge-query-write-file)
408 (define-key emerge-fast-keymap [remap save-buffer] 'emerge-query-save-buffer)
410 (define-key emerge-basic-keymap [menu-bar] (make-sparse-keymap))
412 (define-key emerge-fast-keymap [menu-bar options]
414 (define-key emerge-fast-keymap [menu-bar merge]
416 (define-key emerge-fast-keymap [menu-bar move]
419 (define-key emerge-move-menu [emerge-scroll-reset]
421 (define-key emerge-move-menu [emerge-scroll-right]
423 (define-key emerge-move-menu [emerge-scroll-left]
425 (define-key emerge-move-menu [emerge-scroll-down]
427 (define-key emerge-move-menu [emerge-scroll-up]
429 (define-key emerge-move-menu [emerge-recenter]
431 (define-key emerge-move-menu [emerge-mark-difference]
433 (define-key emerge-move-menu [emerge-jump-to-difference]
435 (define-key emerge-move-menu [emerge-find-difference]
437 (define-key emerge-move-menu [emerge-previous-difference]
439 (define-key emerge-move-menu [emerge-next-difference]
443 (define-key emerge-options-menu [emerge-one-line-window]
445 (define-key emerge-options-menu [emerge-set-merge-mode]
446 '("Set Merge Mode" . emerge-set-merge-mode))
447 (define-key emerge-options-menu [emerge-set-combine-template]
448 '("Set Combine Template..." . emerge-set-combine-template))
449 (define-key emerge-options-menu [emerge-default-B]
451 (define-key emerge-options-menu [emerge-default-A]
453 (define-key emerge-options-menu [emerge-skip-prefers]
455 (define-key emerge-options-menu [emerge-auto-advance]
457 (define-key emerge-options-menu [emerge-edit-mode]
459 (define-key emerge-options-menu [emerge-fast-mode]
462 (define-key emerge-merge-menu [emerge-abort] '("Abort" . emerge-abort))
463 (define-key emerge-merge-menu [emerge-quit] '("Quit" . emerge-quit))
464 (define-key emerge-merge-menu [emerge-split-difference]
466 (define-key emerge-merge-menu [emerge-join-differences]
468 (define-key emerge-merge-menu [emerge-trim-difference]
470 (define-key emerge-merge-menu [emerge-combine-versions]
472 (define-key emerge-merge-menu [emerge-copy-as-kill-B]
474 (define-key emerge-merge-menu [emerge-copy-as-kill-A]
476 (define-key emerge-merge-menu [emerge-insert-B]
478 (define-key emerge-merge-menu [emerge-insert-A]
480 (define-key emerge-merge-menu [emerge-select-B]
482 (define-key emerge-merge-menu [emerge-select-A]
486 ;; Variables which control each merge. They are local to the merge buffer.
489 (emerge-defvar-local emerge-mode nil
491 (emerge-defvar-local emerge-fast-mode nil
493 (emerge-defvar-local emerge-edit-mode nil
495 (emerge-defvar-local emerge-A-buffer nil
497 (emerge-defvar-local emerge-B-buffer nil
499 (emerge-defvar-local emerge-merge-buffer nil
501 (emerge-defvar-local emerge-ancestor-buffer nil
506 '((buffer-modified-p set-buffer-modified-p)
514 (emerge-defvar-local emerge-A-buffer-values nil
516 (emerge-defvar-local emerge-B-buffer-values nil
519 (emerge-defvar-local emerge-difference-list nil
545 (emerge-defvar-local emerge-current-difference -1
547 (emerge-defvar-local emerge-number-of-differences nil
549 (emerge-defvar-local emerge-edit-keymap nil
550 "The local keymap for the merge buffer, with the emerge commands defined in
551 it. Used to save the local keymap during fast mode, when the local keymap is
553 (emerge-defvar-local emerge-old-keymap nil
554 "The original local keymap for the merge buffer.")
555 (emerge-defvar-local emerge-auto-advance nil
558 (emerge-defvar-local emerge-skip-prefers nil
561 (emerge-defvar-local emerge-quit-hook nil
566 (emerge-defvar-local emerge-output-description nil
588 (let ((temp (file-local-copy file-A)))
599 (let ((temp (file-local-copy file-B)))
637 (emerge-set-keys)
643 (emerge-handle-local-variables))
742 (let ((temp (file-local-copy file-A)))
753 (let ((temp (file-local-copy file-B)))
764 (let ((temp (file-local-copy file-ancestor)))
806 (emerge-set-keys)
814 (emerge-handle-local-variables))
1120 (set-buffer-modified-p nil))
1128 (set-buffer-modified-p nil))
1159 (set-buffer-modified-p nil))
1167 (set-buffer-modified-p nil))
1175 (set-buffer-modified-p nil))
1376 ;; Set up the window configuration. If POS is given, set the points to
1407 (defun emerge-set-keys ()
1411 ;; Save the old local map
1412 (setq emerge-old-keymap (current-local-map))
1418 (emerge-force-define-key emerge-edit-keymap emerge-command-prefix
1420 (define-key emerge-edit-keymap [menu-bar] (make-sparse-keymap))
1423 (define-key emerge-edit-keymap [menu-bar options]
1425 (define-key emerge-edit-keymap [menu-bar merge]
1427 (define-key emerge-edit-keymap [menu-bar move]
1431 (substitute-key-definition 'write-file
1434 (substitute-key-definition 'save-buffer
1437 (define-key emerge-edit-keymap [remap write-file] 'emerge-query-write-file)
1438 (define-key emerge-edit-keymap [remap save-buffer] 'emerge-query-save-buffer)
1439 (use-local-map emerge-fast-keymap)
1446 auto-save, and saves them in buffer local variables. Sets the buffers
1525 (setq merge-begin-marker (set-marker
1530 (setq merge-end-marker (set-marker
1558 ;; Process the local-variables list at the end of the merged file, if
1560 (defun emerge-handle-local-variables ()
1561 (if emerge-process-local-variables
1563 (hack-local-variables)
1779 (function (lambda (x) (set-window-hscroll (selected-window) 0)))
1804 (set-window-start (selected-window) beg)
1870 flags of the merged file buffers, restores the local keymap of the merge
1890 (set-marker (aref d 0) nil)
1891 (set-marker (aref d 1) nil)
1892 (set-marker (aref d 2) nil)
1893 (set-marker (aref d 3) nil)
1894 (set-marker (aref d 4) nil)
1895 (set-marker (aref d 5) nil)))
1899 ;; restore the local map
1900 (use-local-map emerge-old-keymap)
1908 (kill-local-variable 'mode-line-buffer-identification)
2020 (use-local-map emerge-fast-keymap)
2024 (message "Fast mode set")
2033 (use-local-map emerge-edit-keymap)
2037 (message "Edit mode set")
2051 "Auto-advance set"
2066 "Skip-prefers set"
2081 (set-buffer emerge-A-buffer)
2095 (set-buffer emerge-B-buffer)
2112 (set-mark opoint)
2113 (set-mark (point))
2130 (set-mark opoint)
2131 (set-mark (point))
2146 (set-mark merge-end))
2148 (set-mark merge-begin))))
2191 (set-buffer standard-output)
2237 ;; set the current difference correctly
2301 ;; set the current difference correctly
2371 ;; {top,bottom}-{a,b,m} are now set at the new beginnings and ends
2514 (defun emerge-set-combine-template (string &optional localize)
2517 With prefix argument, `emerge-combine-versions-template' is made local to this
2521 (make-local-variable 'emerge-combine-versions-template))
2524 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
2525 "emerge-set-combine-versions-template set locally"
2526 "emerge-set-combine-versions-template set")))
2528 (defun emerge-set-combine-versions-template (start end &optional localize)
2531 With prefix argument, `emerge-combine-versions-template' is made local to this
2535 (make-local-variable 'emerge-combine-versions-template))
2538 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
2539 "emerge-set-combine-versions-template set locally."
2540 "emerge-set-combine-versions-template set.")))
2604 (defun emerge-set-merge-mode (mode)
2606 Overrides any change that the mode might make to the mode line or local
2656 (set-marker before (1- before))
2664 (set-marker after-marker (1- after-marker))
2680 (set-marker after (1+ after))
2688 (set-marker before-marker (1+ before-marker))
2783 ;; is set.
2784 ;; If default-file is set, it should be used as the default value.
2785 ;; If A-file is set, and its directory is different from
2786 ;; alternative-default-dir, and if emerge-default-last-directories is set,
2791 ;; if emerge-default-last-directories is set, and
2810 ;; If emerge-default-last-directories is set, use the
2818 ;; If emerge-default-last-directories is set, use the
2888 ;; These functions save (get the values of) and restore (set the values of)
2906 (set var value)
2917 (set-default-file-modes emerge-temp-file-mode)
2919 (set-default-file-modes old-modes))
2992 ;; Define a key, even if a prefix of it is defined
2993 (defun emerge-force-define-key (keymap key definition)
2994 "Like `define-key', but forcibly creates prefix characters as needed.
2996 ;; Find out if a prefix of key is defined
2997 (let ((v (lookup-key keymap key)))
3000 (define-key keymap (substring key 0 v) nil)))
3001 ;; Now define the key
3002 (define-key keymap key definition))
3019 ;; (locals (buffer-local-variables)))
3023 ;; (local-binding (assq minor-mode locals)))
3027 ;; (if (and local-binding
3028 ;; (cdr local-binding)
3036 ;; (set-buffer standard-output)
3044 ;; substitute-key-definition should work now.
3046 ;;(defun emerge-shadow-key-definition (olddef newdef keymap shadowmap)
3063 ;; ;; set the shadowing definition
3064 ;; (let ((key (concat prefix (char-to-string i))))
3065 ;; (emerge-define-key-if-possible shadowmap key newdef)))
3070 ;; ;; set the shadowing definition
3071 ;; (let ((key
3073 ;; (emerge-define-key-if-possible shadowmap key newdef)))
3077 ;; Define a key if it (or a prefix) is not already defined in the map.
3078 (defun emerge-define-key-if-possible (keymap key definition)
3079 ;; look up the present definition of the key
3080 (let ((present (lookup-key keymap key)))
3083 (if (not (lookup-key keymap (substring key 0 present)))
3085 (define-key keymap key definition))
3088 (define-key keymap key definition)))))
3090 ;; Ordinary substitute-key-definition should do this now.
3091 ;;(defun emerge-recursively-substitute-key-definition (olddef newdef keymap)
3092 ;; "Like `substitute-key-definition', but act recursively on subkeymaps.
3099 ;; (substitute-key-definition olddef newdef (cdr (car maps)))