PageRenderTime 78ms CodeModel.GetById 16ms RepoModel.GetById 0ms app.codeStats 0ms

/lisp/ediff-hook.el

https://github.com/kamitchell/emacs
Emacs Lisp | 263 lines | 201 code | 20 blank | 42 comment | 1 complexity | 33f9effd8a782d739caa26a6a59b7c12 MD5 | raw file
    

  1. ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
    2. 

    3. 

  3. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    4. 

  4. ;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    5. 

  5. 

  6. ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
    7. 

  7. 

  8. ;; This file is part of GNU Emacs.
    9. 

  9. 

  10. ;; GNU Emacs is free software: you can redistribute it and/or modify
    11. 

  11. ;; it under the terms of the GNU General Public License as published by
    12. 

  12. ;; the Free Software Foundation, either version 3 of the License, or
    13. 

  13. ;; (at your option) any later version.
    14. 

  14. 

  15. ;; GNU Emacs is distributed in the hope that it will be useful,
    16. 

  16. ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
    17. 

  17. ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    18. 

  18. ;; GNU General Public License for more details.
    19. 

  19. 

  20. ;; You should have received a copy of the GNU General Public License
    21. 

  21. ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
    22. 

  22. 

  23. ;;; Commentary:
    24. 

  24. 

  25. ;;; Code:
    26. 

  26. 

  27. ;;;   These must be placed in menu-bar.el in Emacs
    28. 

  28. ;;
    29. 

  29. ;;      (define-key menu-bar-tools-menu [ediff-misc]
    30. 

  30. ;;	'("Ediff Miscellanea" . menu-bar-ediff-misc-menu))
    31. 

  31. ;;      (define-key menu-bar-tools-menu [epatch]
    32. 

  32. ;;	'("Apply Patch" . menu-bar-epatch-menu))
    33. 

  33. ;;      (define-key menu-bar-tools-menu [ediff-merge]
    34. 

  34. ;;	'("Merge" . menu-bar-ediff-merge-menu))
    35. 

  35. ;;      (define-key menu-bar-tools-menu [ediff]
    36. 

  36. ;;	'("Compare" . menu-bar-ediff-menu))
    37. 

    38. 

  38. ;; Compiler pacifier
    39. 

  39. (defvar ediff-menu)
    40. 

  40. (defvar ediff-merge-menu)
    41. 

  41. (defvar epatch-menu)
    42. 

  42. (defvar ediff-misc-menu)
    43. 

  43. ;; end pacifier
    44. 

  44. 

  45. ;; allow menus to be set up without ediff-wind.el being loaded
    46. 

  46. (defvar ediff-window-setup-function)
    47. 

  47. 

  48. ;; This autoload is useless in Emacs because ediff-hook.el is dumped with
    49. 

  49. ;; emacs, but it is needed in XEmacs
    50. 

  50. ;;;###autoload
    51. 

  51. (if (featurep 'xemacs)
    52. 

  52.     (progn
    53. 

  53.       (defun ediff-xemacs-init-menus ()
    54. 

  54. 	(when (featurep 'menubar)
    55. 

  55. 	  (add-submenu
    56. 

  56. 	   '("Tools") ediff-menu "OO-Browser...")
    57. 

  57. 	  (add-submenu
    58. 

  58. 	   '("Tools") ediff-merge-menu "OO-Browser...")
    59. 

  59. 	  (add-submenu
    60. 

  60. 	   '("Tools") epatch-menu "OO-Browser...")
    61. 

  61. 	  (add-submenu
    62. 

  62. 	   '("Tools") ediff-misc-menu "OO-Browser...")
    63. 

  63. 	  (add-menu-button
    64. 

  64. 	   '("Tools") "-------" "OO-Browser...")
    65. 

  65. 	  ))
    66. 

  66.       (defvar ediff-menu
    67. 

  67. 	'("Compare"
    68. 

  68. 	  ["Two Files..."  ediff-files t]
    69. 

  69. 	  ["Two Buffers..." ediff-buffers t]
    70. 

  70. 	  ["Three Files..."  ediff-files3 t]
    71. 

  71. 	  ["Three Buffers..." ediff-buffers3 t]
    72. 

  72. 	  "---"
    73. 

  73. 	  ["Two Directories..." ediff-directories t]
    74. 

  74. 	  ["Three Directories..." ediff-directories3 t]
    75. 

  75. 	  "---"
    76. 

  76. 	  ["File with Revision..."  ediff-revision t]
    77. 

  77. 	  ["Directory Revisions..."  ediff-directory-revisions t]
    78. 

  78. 	  "---"
    79. 

  79. 	  ["Windows Word-by-word..." ediff-windows-wordwise t]
    80. 

  80. 	  ["Windows Line-by-line..." ediff-windows-linewise t]
    81. 

  81. 	  "---"
    82. 

  82. 	  ["Regions Word-by-word..." ediff-regions-wordwise t]
    83. 

  83. 	  ["Regions Line-by-line..." ediff-regions-linewise t]
    84. 

  84. 	  ))
    85. 

  85.       (defvar ediff-merge-menu
    86. 

  86. 	'("Merge"
    87. 

  87. 	  ["Files..."  ediff-merge-files t]
    88. 

  88. 	  ["Files with Ancestor..." ediff-merge-files-with-ancestor t]
    89. 

  89. 	  ["Buffers..."  ediff-merge-buffers t]
    90. 

  90. 	  ["Buffers with Ancestor..."
    91. 

  91. 	   ediff-merge-buffers-with-ancestor t]
    92. 

  92. 	  "---"
    93. 

  93. 	  ["Directories..."  ediff-merge-directories t]
    94. 

  94. 	  ["Directories with Ancestor..."
    95. 

  95. 	   ediff-merge-directories-with-ancestor t]
    96. 

  96. 	  "---"
    97. 

  97. 	  ["Revisions..."  ediff-merge-revisions t]
    98. 

  98. 	  ["Revisions with Ancestor..."
    99. 

  99. 	   ediff-merge-revisions-with-ancestor t]
    100. 

  100. 	  ["Directory Revisions..." ediff-merge-directory-revisions t]
    101. 

  101. 	  ["Directory Revisions with Ancestor..."
    102. 

  102. 	   ediff-merge-directory-revisions-with-ancestor t]
    103. 

  103. 	  ))
    104. 

  104.       (defvar epatch-menu
    105. 

  105. 	'("Apply Patch"
    106. 

  106. 	  ["To a file..."  ediff-patch-file t]
    107. 

  107. 	  ["To a buffer..." ediff-patch-buffer t]
    108. 

  108. 	  ))
    109. 

  109.       (defvar ediff-misc-menu
    110. 

  110. 	'("Ediff Miscellanea"
    111. 

  111. 	  ["Ediff Manual" ediff-documentation t]
    112. 

  112. 	  ["Customize Ediff" ediff-customize t]
    113. 

  113. 	  ["List Ediff Sessions" ediff-show-registry t]
    114. 

  114. 	  ["Use separate frame for Ediff control buffer"
    115. 

  115. 	   ediff-toggle-multiframe
    116. 

  116. 	   :style toggle
    117. 

  117. 	   :selected (if (and (featurep 'ediff-util)
    118. 

  118. 			      (boundp 'ediff-window-setup-function))
    119. 

  119. 			 (eq ediff-window-setup-function
    120. 

  120. 			     'ediff-setup-windows-multiframe))]
    121. 

  121. 	  ["Use a toolbar with Ediff control buffer"
    122. 

  122. 	   ediff-toggle-use-toolbar
    123. 

  123. 	   :style toggle
    124. 

  124. 	   :selected (if (featurep 'ediff-tbar)
    125. 

  125. 			 (ediff-use-toolbar-p))]))
    126. 

  126. 

  127.       ;; put these menus before Object-Oriented-Browser in Tools menu
    128. 

  128.       (if (and (featurep 'menubar) (not (featurep 'infodock))
    129. 

  129. 	       (not (featurep 'ediff-hook)))
    130. 

  130. 	  (ediff-xemacs-init-menus)))
    131. 

  131.   ;; Emacs
    132. 

  132.   ;; initialize menu bar keymaps
    133. 

  133.   (defvar menu-bar-ediff-misc-menu
    134. 

  134.     (make-sparse-keymap "Ediff Miscellanea"))
    135. 

  135.   (fset 'menu-bar-ediff-misc-menu
    136. 

  136. 	(symbol-value 'menu-bar-ediff-misc-menu))
    137. 

  137.   (defvar menu-bar-epatch-menu (make-sparse-keymap "Apply Patch"))
    138. 

  138.   (fset 'menu-bar-epatch-menu (symbol-value 'menu-bar-epatch-menu))
    139. 

  139.   (defvar menu-bar-ediff-merge-menu (make-sparse-keymap "Merge"))
    140. 

  140.   (fset 'menu-bar-ediff-merge-menu
    141. 

  141. 	(symbol-value 'menu-bar-ediff-merge-menu))
    142. 

  142.   (defvar menu-bar-ediff-menu (make-sparse-keymap "Compare"))
    143. 

  143.   (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
    144. 

  144. 

  145.   ;; define ediff compare menu
    146. 

  146.   (define-key menu-bar-ediff-menu [ediff-misc]
    147. 

  147.     `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
    148. 

  148.   (define-key menu-bar-ediff-menu [separator-ediff-misc] '("--"))
    149. 

  149.   (define-key menu-bar-ediff-menu [window]
    150. 

  150.     `(menu-item ,(purecopy "This Window and Next Window") compare-windows
    151. 

  151. 		:help ,(purecopy "Compare the current window and the next window")))
    152. 

  152.   (define-key menu-bar-ediff-menu [ediff-windows-linewise]
    153. 

  153.     `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise
    154. 

  154. 		:help ,(purecopy "Compare windows line-wise")))
    155. 

  155.   (define-key menu-bar-ediff-menu [ediff-windows-wordwise]
    156. 

  156.     `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise
    157. 

  157. 		:help ,(purecopy "Compare windows word-wise")))
    158. 

  158.   (define-key menu-bar-ediff-menu [separator-ediff-windows] '("--"))
    159. 

  159.   (define-key menu-bar-ediff-menu [ediff-regions-linewise]
    160. 

  160.     `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise
    161. 

  161. 		:help ,(purecopy "Compare regions line-wise")))
    162. 

  162.   (define-key menu-bar-ediff-menu [ediff-regions-wordwise]
    163. 

  163.     `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise
    164. 

  164. 		:help ,(purecopy "Compare regions word-wise")))
    165. 

  165.   (define-key menu-bar-ediff-menu [separator-ediff-regions] '("--"))
    166. 

  166.   (define-key menu-bar-ediff-menu [ediff-dir-revision]
    167. 

  167.     `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions
    168. 

  168. 		:help ,(purecopy "Compare directory files with their older versions")))
    169. 

  169.   (define-key menu-bar-ediff-menu [ediff-revision]
    170. 

  170.     `(menu-item ,(purecopy "File with Revision...") ediff-revision
    171. 

  171. 		:help ,(purecopy "Compare file with its older versions")))
    172. 

  172.   (define-key menu-bar-ediff-menu [separator-ediff-directories] '("--"))
    173. 

  173.   (define-key menu-bar-ediff-menu [ediff-directories3]
    174. 

  174.     `(menu-item ,(purecopy "Three Directories...") ediff-directories3
    175. 

  175. 		:help ,(purecopy "Compare files common to three directories simultaneously")))
    176. 

  176.   (define-key menu-bar-ediff-menu [ediff-directories]
    177. 

  177.     `(menu-item ,(purecopy "Two Directories...") ediff-directories
    178. 

  178. 		:help ,(purecopy "Compare files common to two directories simultaneously")))
    179. 

  179.   (define-key menu-bar-ediff-menu [separator-ediff-files] '("--"))
    180. 

  180.   (define-key menu-bar-ediff-menu [ediff-buffers3]
    181. 

  181.     `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3
    182. 

  182. 		:help ,(purecopy "Compare three buffers simultaneously")))
    183. 

  183.   (define-key menu-bar-ediff-menu [ediff-files3]
    184. 

  184.     `(menu-item ,(purecopy "Three Files...") ediff-files3
    185. 

  185. 		:help ,(purecopy "Compare three files simultaneously")))
    186. 

  186.   (define-key menu-bar-ediff-menu [ediff-buffers]
    187. 

  187.     `(menu-item ,(purecopy "Two Buffers...") ediff-buffers
    188. 

  188. 		:help ,(purecopy "Compare two buffers simultaneously")))
    189. 

  189.   (define-key menu-bar-ediff-menu [ediff-files]
    190. 

  190.     `(menu-item ,(purecopy "Two Files...") ediff-files
    191. 

  191. 		:help ,(purecopy "Compare two files simultaneously")))
    192. 

  192. 

  193.   ;; define ediff merge menu
    194. 

  194.   (define-key
    195. 

  195.     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor]
    196. 

  196.     `(menu-item ,(purecopy "Directory Revisions with Ancestor...")
    197. 

  197.       ediff-merge-directory-revisions-with-ancestor
    198. 

  198.       :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors")))
    199. 

  199.   (define-key
    200. 

  200.     menu-bar-ediff-merge-menu [ediff-merge-dir-revisions]
    201. 

  201.     `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions
    202. 

  202.       :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)")))
    203. 

  203.   (define-key
    204. 

  204.     menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor]
    205. 

  205.     `(menu-item ,(purecopy "Revisions with Ancestor...")
    206. 

  206.       ediff-merge-revisions-with-ancestor
    207. 

  207.       :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor")))
    208. 

  208.   (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions]
    209. 

  209.     `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions
    210. 

  210.       :help ,(purecopy "Merge versions of the same file (without using ancestor information)")))
    211. 

  211.   (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] '("--"))
    212. 

  212.   (define-key
    213. 

  213.     menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor]
    214. 

  214.     `(menu-item ,(purecopy "Directories with Ancestor...")
    215. 

  215.       ediff-merge-directories-with-ancestor
    216. 

  216.       :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors")))
    217. 

  217.   (define-key menu-bar-ediff-merge-menu [ediff-merge-directories]
    218. 

  218.     `(menu-item ,(purecopy "Directories...") ediff-merge-directories
    219. 

  219. 		:help ,(purecopy "Merge files common to a pair of directories")))
    220. 

  220.   (define-key
    221. 

  221.     menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] '("--"))
    222. 

  222.   (define-key
    223. 

  223.     menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor]
    224. 

  224.     `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor
    225. 

  225.       :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor")))
    226. 

  226.   (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers]
    227. 

  227.     `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers
    228. 

  228.       :help ,(purecopy "Merge buffers (without using ancestor information)")))
    229. 

  229.   (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor]
    230. 

  230.     `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor
    231. 

  231.       :help ,(purecopy "Merge files by comparing them with a common ancestor")))
    232. 

  232.   (define-key menu-bar-ediff-merge-menu [ediff-merge-files]
    233. 

  233.     `(menu-item ,(purecopy "Files...") ediff-merge-files
    234. 

  234.       :help ,(purecopy "Merge files (without using ancestor information)")))
    235. 

  235. 

  236.   ;; define epatch menu
    237. 

  237.   (define-key menu-bar-epatch-menu [ediff-patch-buffer]
    238. 

  238.     `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer
    239. 

  239.       :help ,(purecopy "Apply a patch to the contents of a buffer")))
    240. 

  240.   (define-key menu-bar-epatch-menu [ediff-patch-file]
    241. 

  241.     `(menu-item ,(purecopy "To a File...") ediff-patch-file
    242. 

  242.       :help ,(purecopy "Apply a patch to a file")))
    243. 

  243. 

  244.   ;; define ediff miscellanea
    245. 

  245.   (define-key menu-bar-ediff-misc-menu [emultiframe]
    246. 

  246.     `(menu-item ,(purecopy "Use separate control buffer frame")
    247. 

  247.       ediff-toggle-multiframe
    248. 

  248.       :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode")))
    249. 

  249.   (define-key menu-bar-ediff-misc-menu [eregistry]
    250. 

  250.     `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry
    251. 

  251. 		:help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session")))
    252. 

  252.   (define-key menu-bar-ediff-misc-menu [ediff-cust]
    253. 

  253.     `(menu-item ,(purecopy "Customize Ediff") ediff-customize
    254. 

  254. 		:help ,(purecopy "Change some of the parameters that govern the behavior of Ediff")))
    255. 

  255.   (define-key menu-bar-ediff-misc-menu [ediff-doc]
    256. 

  256.     `(menu-item ,(purecopy "Ediff Manual") ediff-documentation
    257. 

  257. 		:help ,(purecopy "Bring up the Ediff manual"))))
    258. 

  258. 

  259. (provide 'ediff-hook)
    260. 

    261. 

  261. 

  262. ;; arch-tag: 512f8656-8a4b-4789-af5d-5c6144498df3
    263. 

  263. ;;; ediff-hook.el ends here
    264. 

  264.