diff options
| -rw-r--r-- | lisp/ediff-hook.el | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el index 6273fcd3fcd..d0b1e34ef70 100644 --- a/lisp/ediff-hook.el +++ b/lisp/ediff-hook.el | |||
| @@ -55,44 +55,44 @@ | |||
| 55 | (cond ((string-match "XEmacs" emacs-version) | 55 | (cond ((string-match "XEmacs" emacs-version) |
| 56 | (defvar ediff-menu | 56 | (defvar ediff-menu |
| 57 | '("Compare" | 57 | '("Compare" |
| 58 | ["Two Files ..." ediff-files t] | 58 | ["Two Files..." ediff-files t] |
| 59 | ["Two Buffers ..." ediff-buffers t] | 59 | ["Two Buffers..." ediff-buffers t] |
| 60 | ["Three Files ..." ediff-files3 t] | 60 | ["Three Files..." ediff-files3 t] |
| 61 | ["Three Buffers ..." ediff-buffers3 t] | 61 | ["Three Buffers..." ediff-buffers3 t] |
| 62 | "---" | 62 | "---" |
| 63 | ["Two Directories ..." ediff-directories t] | 63 | ["Two Directories..." ediff-directories t] |
| 64 | ["Three Directories ..." ediff-directories3 t] | 64 | ["Three Directories..." ediff-directories3 t] |
| 65 | "---" | 65 | "---" |
| 66 | ["File with Revision ..." ediff-revision t] | 66 | ["File with Revision..." ediff-revision t] |
| 67 | ["Directory Revisions ..." ediff-directory-revisions t] | 67 | ["Directory Revisions..." ediff-directory-revisions t] |
| 68 | "---" | 68 | "---" |
| 69 | ["Windows Word-by-word ..." ediff-windows-wordwise t] | 69 | ["Windows Word-by-word..." ediff-windows-wordwise t] |
| 70 | ["Windows Line-by-line ..." ediff-windows-linewise t] | 70 | ["Windows Line-by-line..." ediff-windows-linewise t] |
| 71 | "---" | 71 | "---" |
| 72 | ["Regions Word-by-word ..." ediff-regions-wordwise t] | 72 | ["Regions Word-by-word..." ediff-regions-wordwise t] |
| 73 | ["Regions Line-by-line ..." ediff-regions-linewise t])) | 73 | ["Regions Line-by-line..." ediff-regions-linewise t])) |
| 74 | (defvar ediff-merge-menu | 74 | (defvar ediff-merge-menu |
| 75 | '("Merge" | 75 | '("Merge" |
| 76 | ["Files ..." ediff-merge-files t] | 76 | ["Files..." ediff-merge-files t] |
| 77 | ["Files with Ancestor ..." ediff-merge-files-with-ancestor t] | 77 | ["Files with Ancestor..." ediff-merge-files-with-ancestor t] |
| 78 | ["Buffers ..." ediff-merge-buffers t] | 78 | ["Buffers..." ediff-merge-buffers t] |
| 79 | ["Buffers with Ancestor ..." | 79 | ["Buffers with Ancestor..." |
| 80 | ediff-merge-buffers-with-ancestor t] | 80 | ediff-merge-buffers-with-ancestor t] |
| 81 | "---" | 81 | "---" |
| 82 | ["Directories ..." ediff-merge-directories t] | 82 | ["Directories..." ediff-merge-directories t] |
| 83 | ["Directories with Ancestor ..." | 83 | ["Directories with Ancestor..." |
| 84 | ediff-merge-directories-with-ancestor t] | 84 | ediff-merge-directories-with-ancestor t] |
| 85 | "---" | 85 | "---" |
| 86 | ["Revisions ..." ediff-merge-revisions t] | 86 | ["Revisions..." ediff-merge-revisions t] |
| 87 | ["Revisions with Ancestor ..." | 87 | ["Revisions with Ancestor..." |
| 88 | ediff-merge-revisions-with-ancestor t] | 88 | ediff-merge-revisions-with-ancestor t] |
| 89 | ["Directory Revisions ..." ediff-merge-directory-revisions t] | 89 | ["Directory Revisions..." ediff-merge-directory-revisions t] |
| 90 | ["Directory Revisions with Ancestor ..." | 90 | ["Directory Revisions with Ancestor..." |
| 91 | ediff-merge-directory-revisions-with-ancestor t])) | 91 | ediff-merge-directory-revisions-with-ancestor t])) |
| 92 | (defvar epatch-menu | 92 | (defvar epatch-menu |
| 93 | '("Apply Patch" | 93 | '("Apply Patch" |
| 94 | ["To a file ..." ediff-patch-file t] | 94 | ["To a file..." ediff-patch-file t] |
| 95 | ["To a buffer ..." ediff-patch-buffer t])) | 95 | ["To a buffer..." ediff-patch-buffer t])) |
| 96 | 96 | ||
| 97 | ;; put these menus before Object-Oriented-Browser in Tools menu | 97 | ;; put these menus before Object-Oriented-Browser in Tools menu |
| 98 | (add-hook 'before-init-hook 'ediff-xemacs-init-menus) | 98 | (add-hook 'before-init-hook 'ediff-xemacs-init-menus) |
| @@ -116,72 +116,72 @@ | |||
| 116 | (define-key menu-bar-ediff-menu [window] | 116 | (define-key menu-bar-ediff-menu [window] |
| 117 | '("This Window And Next Window" . compare-windows)) | 117 | '("This Window And Next Window" . compare-windows)) |
| 118 | (define-key menu-bar-ediff-menu [ediff-dir-revision] | 118 | (define-key menu-bar-ediff-menu [ediff-dir-revision] |
| 119 | '("Directory Revisions ..." . ediff-directory-revisions)) | 119 | '("Directory Revisions..." . ediff-directory-revisions)) |
| 120 | (define-key menu-bar-ediff-menu [ediff-revision] | 120 | (define-key menu-bar-ediff-menu [ediff-revision] |
| 121 | '("File with Revision ..." . ediff-revision)) | 121 | '("File with Revision..." . ediff-revision)) |
| 122 | (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) | 122 | (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--")) |
| 123 | (define-key menu-bar-ediff-menu [ediff-directories3] | 123 | (define-key menu-bar-ediff-menu [ediff-directories3] |
| 124 | '("Three Directories ..." . ediff-directories3)) | 124 | '("Three Directories..." . ediff-directories3)) |
| 125 | (define-key menu-bar-ediff-menu [ediff-directories] | 125 | (define-key menu-bar-ediff-menu [ediff-directories] |
| 126 | '("Two Directories ..." . ediff-directories)) | 126 | '("Two Directories..." . ediff-directories)) |
| 127 | (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) | 127 | (define-key menu-bar-ediff-menu [separator-ediff-files] '("--")) |
| 128 | (define-key menu-bar-ediff-menu [ediff-buffers3] | 128 | (define-key menu-bar-ediff-menu [ediff-buffers3] |
| 129 | '("Three Buffers ..." . ediff-buffers3)) | 129 | '("Three Buffers..." . ediff-buffers3)) |
| 130 | (define-key menu-bar-ediff-menu [ediff-files3] | 130 | (define-key menu-bar-ediff-menu [ediff-files3] |
| 131 | '("Three Files ..." . ediff-files3)) | 131 | '("Three Files..." . ediff-files3)) |
| 132 | (define-key menu-bar-ediff-menu [ediff-buffers] | 132 | (define-key menu-bar-ediff-menu [ediff-buffers] |
| 133 | '("Two Buffers ..." . ediff-buffers)) | 133 | '("Two Buffers..." . ediff-buffers)) |
| 134 | (define-key menu-bar-ediff-menu [ediff-files] | 134 | (define-key menu-bar-ediff-menu [ediff-files] |
| 135 | '("Two Files ..." . ediff-files)) | 135 | '("Two Files..." . ediff-files)) |
| 136 | (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) | 136 | (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--")) |
| 137 | (define-key menu-bar-ediff-menu [ediff-regions-linewise] | 137 | (define-key menu-bar-ediff-menu [ediff-regions-linewise] |
| 138 | '("Regions Line-by-line ..." . ediff-regions-linewise)) | 138 | '("Regions Line-by-line..." . ediff-regions-linewise)) |
| 139 | (define-key menu-bar-ediff-menu [ediff-regions-wordwise] | 139 | (define-key menu-bar-ediff-menu [ediff-regions-wordwise] |
| 140 | '("Regions Word-by-word ..." . ediff-regions-wordwise)) | 140 | '("Regions Word-by-word..." . ediff-regions-wordwise)) |
| 141 | (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) | 141 | (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--")) |
| 142 | (define-key menu-bar-ediff-menu [ediff-windows-linewise] | 142 | (define-key menu-bar-ediff-menu [ediff-windows-linewise] |
| 143 | '("Windows Line-by-line ..." . ediff-windows-linewise)) | 143 | '("Windows Line-by-line..." . ediff-windows-linewise)) |
| 144 | (define-key menu-bar-ediff-menu [ediff-windows-wordwise] | 144 | (define-key menu-bar-ediff-menu [ediff-windows-wordwise] |
| 145 | '("Windows Word-by-word ..." . ediff-windows-wordwise)) | 145 | '("Windows Word-by-word..." . ediff-windows-wordwise)) |
| 146 | 146 | ||
| 147 | ;; define merge menu | 147 | ;; define merge menu |
| 148 | (define-key | 148 | (define-key |
| 149 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] | 149 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] |
| 150 | '("Directory Revisions with Ancestor ..." | 150 | '("Directory Revisions with Ancestor..." |
| 151 | . ediff-merge-directory-revisions-with-ancestor)) | 151 | . ediff-merge-directory-revisions-with-ancestor)) |
| 152 | (define-key | 152 | (define-key |
| 153 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] | 153 | menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] |
| 154 | '("Directory Revisions ..." . ediff-merge-directory-revisions)) | 154 | '("Directory Revisions..." . ediff-merge-directory-revisions)) |
| 155 | (define-key | 155 | (define-key |
| 156 | menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] | 156 | menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] |
| 157 | '("Revisions with Ancestor ..." | 157 | '("Revisions with Ancestor..." |
| 158 | . ediff-merge-revisions-with-ancestor)) | 158 | . ediff-merge-revisions-with-ancestor)) |
| 159 | (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] | 159 | (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] |
| 160 | '("Revisions ..." . ediff-merge-revisions)) | 160 | '("Revisions..." . ediff-merge-revisions)) |
| 161 | (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) | 161 | (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--")) |
| 162 | (define-key | 162 | (define-key |
| 163 | menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] | 163 | menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] |
| 164 | '("Directories with Ancestor ..." | 164 | '("Directories with Ancestor..." |
| 165 | . ediff-merge-directories-with-ancestor)) | 165 | . ediff-merge-directories-with-ancestor)) |
| 166 | (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] | 166 | (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] |
| 167 | '("Directories ..." . ediff-merge-directories)) | 167 | '("Directories..." . ediff-merge-directories)) |
| 168 | (define-key | 168 | (define-key |
| 169 | menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) | 169 | menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--")) |
| 170 | (define-key | 170 | (define-key |
| 171 | menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] | 171 | menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] |
| 172 | '("Buffers with Ancestor ..." . ediff-merge-buffers-with-ancestor)) | 172 | '("Buffers with Ancestor..." . ediff-merge-buffers-with-ancestor)) |
| 173 | (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] | 173 | (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] |
| 174 | '("Buffers ..." . ediff-merge-buffers)) | 174 | '("Buffers..." . ediff-merge-buffers)) |
| 175 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] | 175 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] |
| 176 | '("Files with Ancestor ..." . ediff-merge-files-with-ancestor)) | 176 | '("Files with Ancestor..." . ediff-merge-files-with-ancestor)) |
| 177 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files] | 177 | (define-key menu-bar-ediff-merge-menu [ediff-merge-files] |
| 178 | '("Files ..." . ediff-merge-files)) | 178 | '("Files..." . ediff-merge-files)) |
| 179 | 179 | ||
| 180 | ;; define epatch menu | 180 | ;; define epatch menu |
| 181 | (define-key menu-bar-epatch-menu [ediff-patch-buffer] | 181 | (define-key menu-bar-epatch-menu [ediff-patch-buffer] |
| 182 | '("To a Buffer ..." . ediff-patch-buffer)) | 182 | '("To a Buffer..." . ediff-patch-buffer)) |
| 183 | (define-key menu-bar-epatch-menu [ediff-patch-file] | 183 | (define-key menu-bar-epatch-menu [ediff-patch-file] |
| 184 | '("To a File ..." . ediff-patch-file))) | 184 | '("To a File..." . ediff-patch-file))) |
| 185 | 185 | ||
| 186 | ) ; cond | 186 | ) ; cond |
| 187 | 187 | ||