[elpa] externals/ebdb 76621c7 091/350: Clean up keymap bindings

[Eric Abrahamsen]

branch: externals/ebdb
commit 76621c76014e706f30894dd12d86322c82557d1f
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Clean up keymap bindings
    
    * ebdb-com.el (ebdb-mode-map): Almost nothing but align-regexp on
      source code.
---
 ebdb-com.el | 124 +++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 55 deletions(-)

diff --git a/ebdb-com.el b/ebdb-com.el
index 061f7bc..bea3a7a 100644
--- a/ebdb-com.el
+++ b/ebdb-com.el
@@ -279,67 +279,72 @@ With ARG a negative number do not append."
 ;;; Keymap
 (defvar ebdb-mode-map
   (let ((km (make-sparse-keymap)))
-    (define-key km (kbd "+")          'ebdb-append-display)
-    (define-key km (kbd "!")          'ebdb-search-invert)
-    (define-key km (kbd "a")          'ebdb-record-action)
-    (define-key km (kbd "A")          'ebdb-mail-aliases)
-    (define-key km (kbd "c")          'ebdb-create-record)
-    (define-key km (kbd "C")          'ebdb-create-record-extended)
-    (define-key km (kbd "e")          'ebdb-edit-field)
-    (define-key km (kbd "E")          'ebdb-edit-field-customize)
-    (define-key km (kbd ";")          'ebdb-edit-foo)
-    (define-key km (kbd "n")          'ebdb-next-record)
-    (define-key km (kbd "p")          'ebdb-prev-record)
-    (define-key km (kbd "N")          'ebdb-next-field)
-    (define-key km (kbd "TAB")         'ebdb-next-field) ; TAB
-    (define-key km (kbd "P")          'ebdb-prev-field)
-    (define-key km (kbd "DEL")         'ebdb-prev-field) ; DEL
+    (define-key km (kbd "+")           'ebdb-append-display)
+    (define-key km (kbd "!")           'ebdb-search-invert)
+    (define-key km (kbd "a")           'ebdb-record-action)
+    (define-key km (kbd "A")           'ebdb-mail-aliases)
+    (define-key km (kbd "c")           'ebdb-create-record)
+    (define-key km (kbd "C")           'ebdb-create-record-extended)
+    (define-key km (kbd "e")           'ebdb-edit-field)
+    (define-key km (kbd "E")           'ebdb-edit-field-customize)
+    (define-key km (kbd ";")           'ebdb-edit-foo)
+    (define-key km (kbd "n")           'ebdb-next-record)
+    (define-key km (kbd "p")           'ebdb-prev-record)
+    (define-key km (kbd "N")           'ebdb-next-field)
+    (define-key km (kbd "TAB")         'ebdb-next-field)
+    (define-key km (kbd "P")           'ebdb-prev-field)
+    (define-key km (kbd "DEL")         'ebdb-prev-field)
+    ;; Database-related commands
     (define-key km (kbd "d c")          'ebdb-copy-records)
     (define-key km (kbd "d m")          'ebdb-move-records)
     (define-key km (kbd "d e")          'ebdb-customize-database)
     (define-key km (kbd "d r")          'ebdb-reload-database)
     (define-key km (kbd "d d")          'ebdb-disable-database)
-    (define-key km (kbd "f")          'ebdb-format-to-tmp-buffer)
-    (define-key km (kbd "C-k")       'ebdb-delete-field-or-record)
-    (define-key km (kbd "i")          'ebdb-insert-field)
-    (define-key km (kbd "RET")  'ebdb-follow-related)
-    (define-key km (kbd "s")          'ebdb-save)
-    (define-key km (kbd "C-x C-s")   'ebdb-save)
-    (define-key km (kbd "t")          'ebdb-toggle-records-format)
-    (define-key km (kbd "T")          'ebdb-display-records-completely)
-    (define-key km (kbd "#")          'ebdb-toggle-record-mark)
-    (define-key km (kbd "M-#")        'ebdb-toggle-all-record-marks)
-    (define-key km (kbd "C-#")        'ebdb-unmark-all-records)
-    (define-key km (kbd "o")          'ebdb-omit-records)
-    (define-key km (kbd "m")          'ebdb-mail)
-    (define-key km (kbd "M-d")       'ebdb-dial)
-    (define-key km (kbd "h")          'ebdb-info)
-    (define-key km (kbd "?")          'ebdb-help)
-    ;; (define-key km (kbd "q"       'quit-window) ; part of `special-mode' 
bindings
-    (define-key km (kbd "w r")         'ebdb-copy-records-as-kill)
-    (define-key km (kbd "w f")         'ebdb-copy-fields-as-kill)
-    (define-key km (kbd "w m")         'ebdb-copy-mail-as-kill)
-    ;; (define-key km (kbd "P"       'ebdb-print)
-    (define-key km (kbd "=")          'delete-other-windows)
+
+    (define-key km (kbd "r")           'ebdb-reformat-records)
+    (define-key km (kbd "f")           'ebdb-format-to-tmp-buffer)
+    (define-key km (kbd "C-k")         'ebdb-delete-field-or-record)
+    (define-key km (kbd "i")           'ebdb-insert-field)
+    (define-key km (kbd "RET")         'ebdb-follow-related)
+    (define-key km (kbd "s")           'ebdb-save)
+    (define-key km (kbd "C-x C-s")     'ebdb-save)
+    (define-key km (kbd "t")           'ebdb-toggle-records-format)
+    (define-key km (kbd "T")           'ebdb-display-records-completely)
+    ;; Marking
+    (define-key km (kbd "#")           'ebdb-toggle-record-mark)
+    (define-key km (kbd "M-#")         'ebdb-toggle-all-record-marks)
+    (define-key km (kbd "C-#")         'ebdb-unmark-all-records)
+
+    (define-key km (kbd "o")           'ebdb-omit-records)
+    (define-key km (kbd "m")           'ebdb-mail)
+    (define-key km (kbd "M-d")         'ebdb-dial)
+    (define-key km (kbd "h")           'ebdb-info)
+    (define-key km (kbd "?")           'ebdb-help)
+    ;; Copying data
+    (define-key km (kbd "w r")         'ebdb-copy-records-as-kill)
+    (define-key km (kbd "w f")         'ebdb-copy-fields-as-kill)
+    (define-key km (kbd "w m")         'ebdb-copy-mail-as-kill)
+    ;; (define-key km (kbd "P"         'ebdb-print)
+    (define-key km (kbd "=")           'delete-other-windows)
     ;; Buffer manipulation
-    (define-key km (kbd "b c")         'ebdb-clone-buffer)
-    (define-key km (kbd "b r")         'ebdb-rename-buffer)
+    (define-key km (kbd "b c")         'ebdb-clone-buffer)
+    (define-key km (kbd "b r")         'ebdb-rename-buffer)
     ;; Search keys
-    (define-key km (kbd "/ /")         'ebdb)
-    (define-key km (kbd "/ 1")         'ebdb-search-single-record)
-    (define-key km (kbd "/ n")         'ebdb-search-name)
-    (define-key km (kbd "/ o")         'ebdb-search-organization)
-    (define-key km (kbd "/ p")         'ebdb-search-phone)
-    (define-key km (kbd "/ a")         'ebdb-search-address)
-    (define-key km (kbd "/ m")         'ebdb-search-mail)
-    (define-key km (kbd "/ N")         'ebdb-search-user-fields)
-    (define-key km (kbd "/ x")         'ebdb-search-user-fields)
-    (define-key km (kbd "/ c")         'ebdb-search-changed)
-    (define-key km (kbd "/ C")         'ebdb-search-record-class)
-    (define-key km (kbd "/ d")         'ebdb-search-duplicates)
-    (define-key km (kbd "/ D")         'ebdb-search-database)
-    (define-key km (kbd "C-x n w")     'ebdb-display-all-records)
-    (define-key km (kbd "C-x n d")     'ebdb-display-current-record)
+    (define-key km (kbd "/ /")         'ebdb)
+    (define-key km (kbd "/ 1")         'ebdb-search-single-record)
+    (define-key km (kbd "/ n")         'ebdb-search-name)
+    (define-key km (kbd "/ o")         'ebdb-search-organization)
+    (define-key km (kbd "/ p")         'ebdb-search-phone)
+    (define-key km (kbd "/ a")         'ebdb-search-address)
+    (define-key km (kbd "/ m")         'ebdb-search-mail)
+    (define-key km (kbd "/ N")         'ebdb-search-user-fields)
+    (define-key km (kbd "/ x")         'ebdb-search-user-fields)
+    (define-key km (kbd "/ c")         'ebdb-search-changed)
+    (define-key km (kbd "/ C")         'ebdb-search-record-class)
+    (define-key km (kbd "/ d")         'ebdb-search-duplicates)
+    (define-key km (kbd "/ D")         'ebdb-search-database)
+    (define-key km (kbd "C-x n w")     'ebdb-display-all-records)
+    (define-key km (kbd "C-x n d")     'ebdb-display-current-record)
 
     (define-key km [mouse-3]    'ebdb-mouse-menu)
     (define-key km [mouse-2]    (lambda (event)
@@ -909,7 +914,9 @@ displayed records."
      ["Toggle record mark" ebdb-toggle-record-mark t]
      "--"
      ["Toggle layout" ebdb-toggle-records-format t]
-     ["Show all fields" ebdb-display-records-completely t])
+     ["Show all fields" ebdb-display-records-completely t]
+     ["Reformat record" ebdb-reformat-records t]
+     )
     ("Searching"
      ["General search" ebdb t]
      ["Search one record" ebdb-search-single-record t]
@@ -1346,6 +1353,13 @@ With prefix N move backwards N (sub)fields."
                                 ebdb-records)))
   (ebdb-redisplay-records (mapcar #'car records) 'unmark))
 
+(defun ebdb-reformat-records (records)
+  "Reformat RECORDS in-place."
+  ;; This function ideally wouldn't be necessary, but obviously there
+  ;; will be times...
+  (interactive (list (ebdb-do-records)))
+  (ebdb-redisplay-records records 'reformat))
+
 ;; Buffer manipulation
 
 ;;;###autoload