[elpa] externals/ergoemacs-mode bb77fa2 131/325: Replace ergoemacs-print-buffer-confirm with pr-interface everywhere

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit bb77fa27862d98e24ee8c3ca5f69e501b00c8370
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Replace ergoemacs-print-buffer-confirm with pr-interface everywhere
---
 ergoemacs-functions.el    |  9 ---------
 ergoemacs-theme-engine.el |  2 +-
 ergoemacs-themes.el       | 24 +++++++++++-------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index e495f01..c20b349 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -349,15 +349,6 @@ If TERMINAL is non-nil, run the terminal version"
   (end-of-line)
   (newline-and-indent))
 
-(defun ergoemacs-print-buffer-confirm ()
-  "Print current buffer, but ask for confirmation first.
-If `pr-interface' is available, use that function instead."
-  (interactive)
-  (if (fboundp 'pr-interface)
-      (call-interactively 'pr-interface)
-    (when (y-or-n-p "Print current buffer? ")
-      (print-buffer))))
-
 (defun ergoemacs-call-keyword-completion ()
   "Call the command that has keyboard shortcut M-TAB."
   (interactive)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 2986b0c..d4a9d3f 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -650,7 +650,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
         (ergoemacs-org-edit-src "Edit Source")
         (ergoemacs-paste "paste")
         (ergoemacs-paste-cycle "paste ↑")
-        (ergoemacs-print-buffer-confirm "Print")
+        (pr-interface "Print")
         (ergoemacs-read-key--universal-argument "Argument")
         (ergoemacs-select-current-block "Sel. Block")
         (ergoemacs-select-current-line "Sel. Line")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 30f7682..28568b4 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -257,7 +257,7 @@ calling any other ergoemacs-set-* function"
   
   (global-set-key (kbd "C-S-s") 'write-file)
 
-  (global-set-key (kbd "C-p") 'ergoemacs-print-buffer-confirm)
+  (global-set-key (kbd "C-p") 'pr-interface)
 
   (global-set-key (kbd "C-a") 'mark-whole-buffer)
   
@@ -294,14 +294,14 @@ calling any other ergoemacs-set-* function"
   (global-set-key (kbd "<M-down>") 'ergoemacs-forward-block)
 
   ;; C-r also should be refresh
-  (global-set-key (kbd "C-r") 'revert-buffer)
+  (global-set-key (kbd "C-r") 'ergoemacs-revert-buffer)
 
   (global-set-key (kbd "C-+") 'text-scale-increase)
   (global-set-key (kbd "C-=") 'text-scale-increase)
   (global-set-key (kbd "C--") 'text-scale-decrease)
   (global-set-key (kbd "C-_") 'text-scale-decrease)
-  (global-set-key (kbd "C-.") 'keyboard-quit)
-  (global-set-key (kbd "C->") 'keyboard-quit)
+  (global-set-key (kbd "C-.") 'ergoemacs-keyboard-quit)
+  (global-set-key (kbd "C->") 'ergoemacs-keyboard-quit)
   (global-set-key (kbd "C-/") 'info)
   (global-set-key (kbd "C-0") 'ergoemacs-text-scale-normal-size)
   (global-set-key (kbd "C-)") 'ergoemacs-text-scale-normal-size)
@@ -320,7 +320,7 @@ calling any other ergoemacs-set-* function"
   (global-set-key (kbd "C-l") 'goto-line)
   (global-set-key (kbd "C-n") 'ergoemacs-new-empty-buffer)
   (global-set-key (kbd "C-o") 'find-file)
-  (global-set-key (kbd "C-p") 'ergoemacs-print-buffer-confirm)
+  (global-set-key (kbd "C-p") 'pr-interface)
 
   (global-set-key (kbd "C-w") 'ergoemacs-close-current-buffer)
   (global-set-key (kbd "M-B") 'ibuffer)
@@ -629,7 +629,7 @@ calling any other ergoemacs-set-* function"
 
 (defun ergoemacs-set-quit ()
   "Escape exits"
-  (ergoemacs-global-set-key (kbd "<escape>") 'keyboard-quit)
+  (ergoemacs-global-set-key (kbd "<escape>") 'ergoemacs-keyboard-quit)
   (ergoemacs-define-key isearch-mode-map (kbd "<escape>") 'isearch-abort)
   )
 
@@ -666,8 +666,6 @@ calling any other ergoemacs-set-* function"
   (when mark-active
     (global-set-key (kbd "TAB") 'indent-region))
   (when ergoemacs-mode
-    (global-set-key [remap keyboard-quit] 'ergoemacs-keyboard-quit)
-    (global-set-key [remap revert-buffer] 'ergoemacs-revert-buffer)
     (global-set-key [remap eshell] 'ergoemacs-eshell-here)
     (global-set-key [remap powershell] 'ergoemacs-powershell-here)
     (global-set-key [remap shell] 'ergoemacs-shell-here)
@@ -675,8 +673,8 @@ calling any other ergoemacs-set-* function"
                     'ergoemacs-command-loop--universal-argument)
     (global-set-key [remap describe-mode]
                     'ergoemacs-describe-major-mode)
-    (global-set-key [remap ergoemacs-print-buffer-confirm]
-                    'pr-interface)))
+    )
+  )
 
 (defun ergoemacs-set-menu-bar-file ()
   "File menu"
@@ -705,8 +703,8 @@ calling any other ergoemacs-set-* function"
                           (separator1 menu-item "--")
                           (save-buffer menu-item "Save" save-buffer)
                           (write-file menu-item "Save As..." write-file)
-                          (revert-buffer menu-item "Revert to Saved" 
revert-buffer)
-                          (print-buffer menu-item "Print" 
ergoemacs-print-buffer-confirm)
+                          (revert-buffer menu-item "Revert to Saved" 
ergoemacs-revert-buffer)
+                          (print-buffer menu-item "Print" pr-interface)
                           (separator4 menu-item "--")
                           (split-window-below menu-item "Split Window"
                                               split-window-below)
@@ -1274,7 +1272,7 @@ calling any other ergoemacs-set-* function"
   (define-key term-raw-map (kbd "C-S-w") 'delete-frame)
   (define-key term-raw-map (kbd "C-`") 'other-frame)
   (define-key term-raw-map (kbd "C-n") 'ergoemacs-new-empty-buffer)
-  (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
+  (define-key term-raw-map (kbd "C-p") 'pr-interface)
   
   (define-key term-raw-map (kbd "M-j") 'backward-char)
   (define-key term-raw-map (kbd "M-l") 'forward-char)