--- autoconf/emacsbrand.orig	2018-02-04 23:59:28.000000000 -0700

+++ autoconf/emacsbrand	2018-06-17 15:34:30.642359854 -0600

@@ -35,7 +35,8 @@ done

 #*    The autodetection ELisp expression                               */

 #*---------------------------------------------------------------------*/

 expr="(cond \

-        ((string-match \"GNU Emacs 25\" (emacs-version)) (kill-emacs 25))

+        ((string-match \"GNU Emacs 26\" (emacs-version)) (kill-emacs 26)) \

+        ((string-match \"GNU Emacs 25\" (emacs-version)) (kill-emacs 25)) \

         ((string-match \"GNU Emacs 24\" (emacs-version)) (kill-emacs 24)) \

         ((string-match \"GNU Emacs 23\" (emacs-version)) (kill-emacs 23)) \

         ((string-match \"GNU Emacs 22\" (emacs-version)) (kill-emacs 22)) \

@@ -67,7 +68,11 @@ else

             if [ "$version" = "25" ]; then

               echo "emacs25"      

             else

-              echo "generic";

+              if [ "$version" = "26" ]; then

+                echo "emacs26"

+              else

+                echo "generic";

+              fi

             fi    

           fi

         fi

--- bmacs/bee/bee-browse.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bee/bee-browse.el	2018-06-17 15:32:42.037634520 -0600

@@ -144,14 +144,16 @@

 				     (select-frame frame)

 				     (select-window win)

 				     (set-buffer buffer)

-				     (goto-line line)

+				     (goto-char (point-min))

+				     (forward-line (1- line))

 				     (recenter)

 				     t)

 				 nil))))))

 	    (let ((pop-up-frames t)

 		  (buffer (find-file-noselect aname)))

 	      (pop-to-buffer buffer)

-	      (goto-line line)

+	      (goto-char (point-min))

+	      (forward-line (1- line))

 	      (recenter)))))

     t)

    ((and (consp command) 

--- bmacs/bee/bee-expand.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bee/bee-expand.el	2018-06-17 15:32:42.043634505 -0600

@@ -79,9 +79,10 @@

 (defun bee-set-expand-temporary-buffer ()

   (if (and (bufferp bee-expand-temporary-buffer)

 	   (buffer-live-p bee-expand-temporary-buffer))

-      (save-excursion

-	(set-buffer bee-expand-temporary-buffer)

-	(toggle-read-only nil)

+      (with-current-buffer bee-expand-temporary-buffer

+	(if (featurep 'xemacs)

+	    (toggle-read-only 0)

+	  (setq buffer-read-only nil))

 	(erase-buffer))

     (setq bee-expand-temporary-buffer (get-buffer-create "*bee tmp expand*"))))

@@ -106,7 +107,7 @@

       (funcall completion-hook bee-expand-temporary-buffer))

   (delete-file (buffer-file-name bee-expand-temporary-buffer))

   (set-buffer-modified-p nil)

-  (toggle-read-only t)

+  (if (featurep 'xemacs) (toggle-read-only 1) (setq buffer-read-only t))

   (let* ((pop-up-frames t)

 	 (lines      (+ 3 (count-lines (point-min) (point-max))))

 	 (cur-height (frame-height (selected-frame)))

@@ -133,7 +134,7 @@

 		   (bee-get-temp-name)))))

     (bee-set-expand-temporary-buffer)

     (set-buffer bee-expand-temporary-buffer)

-    (insert-buffer buf)

+    (insert-buffer-substring buf)

     (write-file fname nil)

     (bee-expand-buffer-internal)))

--- bmacs/bee/bee-indent.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bee/bee-indent.el	2018-06-17 15:32:42.044634502 -0600

@@ -157,7 +157,7 @@ of the start of the containing expressio

 (defun bee-calculate-forced-indent ()

   (when (> (count-lines 1 (point)) 1)

     (save-excursion

-      (previous-line 1)

+      (forward-line -1)

       (beginning-of-line)

       (skip-chars-forward " \t")

       (let ((s (current-column)))

--- bmacs/bee/bee-module.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bee/bee-module.el	2018-06-17 15:32:42.045634500 -0600

@@ -359,8 +359,7 @@

 ;*    bee-get-module-name ...                                          */

 ;*---------------------------------------------------------------------*/

 (defun bee-get-module-name (buffer)

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (goto-char (point-min))

     ;; first we search for the module declaration

     (if (re-search-forward (concat "(module[ \n\t]\\(" (ude-ident-regexp)

--- bmacs/bee/bee-usage.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bee/bee-usage.el	2018-06-17 15:32:42.046634497 -0600

@@ -33,9 +33,7 @@

 						  (goto-char pos)

 						  (beginning-of-line)

 						  (point))

-						(save-excursion

-						  (end-of-line)

-						  (point)))))

+						(point-at-eol))))

     (vector (concat "def   : " define)

 	    `(let ((pop-up-frames t))

 	       (pop-to-buffer ,buffer)

@@ -271,7 +269,7 @@ It is used to bypass the buffer local va

 			(pop-to-buffer buffer))

 		      (set-buffer buffer)

 		      (goto-char (point-min))

-		      (goto-line (string-to-number line)))

+		      (forward-line (1- (string-to-number line))))

 		  (ude-error "Can't find buffer for %S" file))))))))

 ;*---------------------------------------------------------------------*/

--- bmacs/bug/bug-class.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-class.el	2018-06-17 15:32:42.046634497 -0600

@@ -36,15 +36,13 @@

 ;*    bug-file-to-string ...                                           */

 ;*---------------------------------------------------------------------*/

 (defun bug-file-to-string (file)

-  (save-excursion

-    (let ((buffer (bug-find-file file)))

-      (if buffer

-	  (progn

-	    (set-buffer buffer)

-	    (let ((s (buffer-string)))

-	      (kill-buffer buffer)

-	      s))

-	""))))

+  (let ((buffer (bug-find-file file)))

+    (if buffer

+	(with-current-buffer buffer

+	  (let ((s (buffer-string)))

+	    (kill-buffer buffer)

+	    s))

+      "")))

 ;*---------------------------------------------------------------------*/

 ;*    bug-jfile-module-name ...                                        */

@@ -104,8 +102,7 @@

 (defun bug-file-to-class (file)

   (interactive "Ffile: ")

   (let ((buffer (get-buffer file)))

-    (save-excursion

-      (set-buffer buffer)

+    (with-current-buffer buffer

       (if bug-buffer-class

 	  bug-buffer-class

 	(progn

--- bmacs/bug/bug-connect.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-connect.el	2018-06-17 15:32:42.047634495 -0600

@@ -74,8 +74,7 @@

 ;*    This function returns the point line number.                     */

 ;*---------------------------------------------------------------------*/

 (defun bug-line-number (buffer pos)

-  (save-restriction

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (let (start)

       (save-excursion

 	(save-restriction

--- bmacs/bug/bug.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug.el	2018-06-17 15:32:42.048634492 -0600

@@ -71,7 +71,10 @@ and source-file directory for your debug

 	     `(,bugname ,binary ,nil ,@(bug-string->list bug-emacs-option)

 			,a.out))

       ;; the process filter and sentinel

-      (process-kill-without-query (get-buffer-process bug-comint-buffer))

+      (if (featurep 'xemacs)

+	  (process-kill-without-query (get-buffer-process bug-comint-buffer))

+	(set-process-query-on-exit-flag (get-buffer-process bug-comint-buffer)

+					nil))

       (set-process-filter (get-buffer-process bug-comint-buffer)

 			  'bug-filter))

     ;; we start the bug-mode

@@ -130,8 +133,7 @@ and source-file directory for your debug

 (defun bugloo-quit ()

   (interactive)

   (if (bufferp bug-comint-buffer)

-      (save-excursion

-	(set-buffer bug-comint-buffer)

+      (with-current-buffer bug-comint-buffer

 	(condition-case ()

 	    (comint-kill-subjob)

 	  (error

--- bmacs/bug/bug-filter.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-filter.el	2018-06-17 15:32:42.048634492 -0600

@@ -51,9 +51,7 @@

 ;*    bug-buffer-text-properties-at ...                                */

 ;*---------------------------------------------------------------------*/

 (defun bug-buffer-text-properties-at (buf p)

-  (save-excursion

-    (set-buffer buf)

-    (text-properties-at p)))

+  (text-properties-at p buf))

 ;*---------------------------------------------------------------------*/

 ;*    bug-filter-init ...                                              */

@@ -272,10 +270,8 @@

   (insert-text-property 0 (length output) 'keymap bug-filter-footprint-map output)

   (insert-text-property 0 (length output) 'help-echo "mouse-3: Edit properties" output)

   (funcall bug-filter-output proc output)

-  (save-excursion

-    (set-buffer bug-comint-buffer)

-    (bug-add-image-overlay bug-comint-buffer (1- (point-max))

-			   bug-footprint-enable-image)))

+  (bug-add-image-overlay bug-comint-buffer (1- (point-max))

+			 bug-footprint-enable-image))

 ;*---------------------------------------------------------------------*/

 ;*    bug-filter-breakpoint-map ...                                    */

@@ -303,10 +299,8 @@

   (insert-text-property 0 (length output) 'keymap bug-filter-breakpoint-map output)

   (insert-text-property 0 (length output) 'help-echo "mouse-3: Edit properties" output)

   (funcall bug-filter-output proc output)

-  (save-excursion

-    (set-buffer bug-comint-buffer)

-    (bug-add-image-overlay bug-comint-buffer (1- (point-max))

-			   bug-breakpoint-red-image)))

+  (bug-add-image-overlay bug-comint-buffer (1- (point-max))

+			 bug-breakpoint-red-image))

 ;*---------------------------------------------------------------------*/

 ;*    bug-filter-ident-map ...                                         */

--- bmacs/bug/bug-gnu-emacs.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-gnu-emacs.el	2018-06-17 15:32:42.049634490 -0600

@@ -14,6 +14,7 @@

 ;*---------------------------------------------------------------------*/

 (provide 'bug-gnu-emacs)

 (require 'bug-custom)

+(require 'bmacs-gnu-emacs)

 ;*---------------------------------------------------------------------*/

 ;*    GNU emacs settings...                                            */

@@ -49,9 +50,9 @@

 ;*    bug-add-margin-image-overlay ...                                 */

 ;*---------------------------------------------------------------------*/

 (defun bug-add-margin-image-overlay (buffer line image)

-  (save-excursion

-    (set-buffer buffer)

-    (goto-line line)

+  (with-current-buffer buffer

+    (goto-char (point-min))

+    (forward-line (1- line))

     (let ((o (make-overlay (line-beginning-position)

 			   (1+ (line-beginning-position))))

 	  (s (string ? )))

@@ -69,8 +70,7 @@

 ;*    bug-add-image-overlay ...                                        */

 ;*---------------------------------------------------------------------*/

 (defun bug-add-image-overlay (buffer char image)

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (goto-char char)

     (let ((o (make-overlay (line-beginning-position)

 			   (1+ (line-beginning-position))))

@@ -132,12 +132,12 @@

       (progn

 	(setq bug-gnu-emacs-source-line-overlay (make-overlay 1 1))

 	(overlay-put bug-gnu-emacs-source-line-overlay 'face 'bug-line-face)))

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (let ((pos))

       (save-restriction

 	(widen)

-	(goto-line line)

+	(goto-char (point-min))

+	(forward-line (1- line))

 	(setq pos (point))

 	(move-overlay bug-gnu-emacs-source-line-overlay

 		      (line-beginning-position)

--- bmacs/bug/bug-hooking.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-hooking.el	2018-06-17 15:32:42.049634490 -0600

@@ -48,7 +48,7 @@

 	(redisplay-frame)

 	(sit-for 0.2)

 	(bug-wait-process "hooks" bug-hook-timeout)

-	(mapcar (lambda (hook) (funcall hook)) bug-command-hooks)

+	(mapc (lambda (hook) (funcall hook)) bug-command-hooks)

 	(redisplay-frame)

 	(setq bug-command-hook-p nil))))

@@ -69,8 +69,7 @@

     ;; we wait for comint to be ready

     (sit-for 0.1)

     (if (bug-wait-process "bug-hook-command" bug-hook-timeout)

-	(save-excursion

-	  (set-buffer buffer)

+	(with-current-buffer buffer

 	  (let ((buffer-read-only nil))

 	    (erase-buffer)

 	    ;; Temporarily install our filter function.

@@ -79,8 +78,7 @@

 		  (old-prompt-hook bug-prompt-hook))

 	      (setq bug-filter-output

 		    #'(lambda (proc str)

-			(save-excursion

-			  (set-buffer buffer)

+			(with-current-buffer buffer

 			  (goto-char (point-max))

 			  (insert str))))

 	      (setq bug-prompt-hook

--- bmacs/bug/bug-process.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-process.el	2018-06-17 15:32:42.049634490 -0600

@@ -63,8 +63,7 @@

   (let ((proc (get-buffer-process bug-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer bug-comint-buffer)

+    (with-current-buffer bug-comint-buffer

       (goto-char (process-mark proc))

       (delete-region (point) (point-max))

       (process-send-string proc (concat command "\n")))))

@@ -83,47 +82,45 @@

 (defun bug-wait-process (from timeout)

   (if (not bug-comint-buffer)

       (ude-error "No debugger running")

-    (save-excursion

-      (save-restriction

-	(widen)

-	(let ((count 0)

-	      (str   "/-\\|")

-	      (l (length bug-prompt-regexp)))

-	  (setq str str)

-	  (set-buffer bug-comint-buffer)

-	  ;; we mark bug waiting

-	  (setq bug-waiting t)

-	  (accept-process-output)

-	  (goto-char (point-max))

-	  (while (progn

-		   (goto-char (point-max))

-		   (or (<= (point) l)

-		       (and (save-excursion

-			      (backward-char l)

-			      (not (re-search-forward bug-prompt-eol-regexp

-						      (point-max)

-						      t)))

-			    (or (not (numberp timeout))

-				(< count timeout)))))

+    (with-current-buffer bug-comint-buffer

+      (save-excursion

+	(save-restriction

+	  (widen)

+	  (let ((count 0)

+		(str   "/-\\|")

+		(l (length bug-prompt-regexp)))

+	    ;; we mark bug waiting

+	    (setq bug-waiting t)

 	    (accept-process-output)

-	    (setq count (+ 1 count))

-	    (if (numberp timeout)

+	    (goto-char (point-max))

+	    (while (progn

+		     (goto-char (point-max))

+		     (or (<= (point) l)

+			 (and (save-excursion

+				(backward-char l)

+				(not (re-search-forward bug-prompt-eol-regexp

+							(point-max)

+							t)))

+			      (or (not (numberp timeout))

+				  (< count timeout)))))

+	      (accept-process-output)

+	      (setq count (+ 1 count))

+	      (if (numberp timeout)

+		  (display-message 'no-log

+		    (format "waiting for `%s' [%c] (timeout %d/%S)"

+			    from

+			    (aref str (% count 4))

+			    count

+			    timeout))

 		(display-message 'no-log

-				 (format "waiting for `%s' [%c] (timeout %d/%S)"

-					 from

-					 (aref str (% count 4))

-					 count

-					 timeout))

-	      (display-message 'no-log

-			       (format "waiting for `%s' [%c]"

-				       from

-				       (aref str (% count 4)))))

-	    (sit-for 0.3)

-	    (redisplay-frame (selected-frame) t))

-	  ;; we remove the last wait message

-	  (display-message 'no-log " ")

-	  ;; bug is now ready

-	  (setq bug-waiting nil)

-	  (or (not (numberp timeout))

-	      (< count timeout)))))))

-

+		  (format "waiting for `%s' [%c]"

+			  from

+			  (aref str (% count 4)))))

+	      (sit-for 0.3)

+	      (redisplay-frame (selected-frame) t))

+	    ;; we remove the last wait message

+	    (display-message 'no-log " ")

+	    ;; bug is now ready

+	    (setq bug-waiting nil)

+	    (or (not (numberp timeout))

+		(< count timeout))))))))

--- bmacs/bug/bug-source.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-source.el	2018-06-17 15:32:42.049634490 -0600

@@ -80,7 +80,8 @@

 			(display-buffer buffer))))

 	  (set-buffer buffer)

 	  (bug-connect-buffer buffer)

-	  (goto-line line)

+	  (goto-char (point-min))

+	  (forward-line (1- line))

 	  (set-window-point window (point))

 	  (if bug-raise-active-source-frame-p

 	      (let ((frame (window-frame window)))

--- bmacs/bug/bug-xemacs.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/bug/bug-xemacs.el	2018-06-17 15:32:42.049634490 -0600

@@ -143,7 +143,8 @@ static char *arrow[] = {

       (save-excursion

 	(save-restriction

 	  (widen)

-	  (goto-line line)

+	  (goto-char (point-min))

+	  (forward-line (1- line))

 	  (setq pos (point))))

       (goto-char pos)

       (set-window-point window pos)

@@ -162,9 +163,9 @@ static char *arrow[] = {

 ;*    bug-add-margin-image-overlay ...                                 */

 ;*---------------------------------------------------------------------*/

 (defun bug-add-margin-image-overlay (buffer line image)

-  (save-excursion

-    (set-buffer buffer)

-    (goto-line line)

+  (with-current-buffer buffer

+    (goto-char (point-min))

+    (forward-line (1- line))

     (let ((o (make-extent (line-beginning-position)

 			  (1+ (line-beginning-position))

 			  buffer)))

@@ -177,8 +178,7 @@ static char *arrow[] = {

 ;*    bug-add-image-overlay ...                                        */

 ;*---------------------------------------------------------------------*/

 (defun bug-add-image-overlay (buffer char image)

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (goto-char char)

     (let ((o (make-extent (line-beginning-position)

 			  (1+ (line-beginning-position))

--- bmacs/cee/cee-kbdb.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/cee/cee-kbdb.el	2018-06-17 15:32:42.049634490 -0600

@@ -389,7 +389,8 @@

 		      (select-frame frame)

 		      (select-window win)

 		      (set-buffer buf)

-		      (goto-line npos)

+		      (goto-char (point-min))

+		      (forward-line (1- npos))

 		      (beginning-of-line)

 		      (set-window-point win npos)

 		      t))))

@@ -399,7 +400,8 @@

 	  (if (bufferp buf)

 	      (progn

 		(set-buffer buf)

-		(goto-line npos)

+		(goto-char (point-min))

+		(forward-line (1- npos))

 		(beginning-of-line)

 		t))))

        (t

--- bmacs/dbg/dbg-args.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/dbg/dbg-args.el	2018-06-17 15:32:42.049634490 -0600

@@ -100,8 +100,7 @@ This is implemented using the DBG `args'

   (let ((proc (get-buffer-process dbg-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

       (goto-char (process-mark proc))

       (while (not (looking-at comint-prompt-regexp))

 	(goto-char (process-mark proc))

@@ -140,8 +139,7 @@ This is implemented using the DBG `args'

 ;*    Args a new args in a separate buffer.                            */

 ;*---------------------------------------------------------------------*/

 (defun dbg-args-args (buffer args)

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (let ((buffer-read-only nil))

       (erase-buffer)

       (insert args)

@@ -164,12 +162,12 @@ This is implemented using the DBG `args'

 					 'mouse-face 'highlight

 					 'keymap dbg-args-mouse-map)

 		    (if (< end (point-max))

-			(next-line 1)

+			(forward-line 1)

 		      (setq keep nil)))

 		(progn

 		  (end-of-line)

 		  (if (< (point) (point-max))

-		      (next-line 1)

+		      (forward-line 1)

 		    (setq keep nil)))))))))))

 ;*---------------------------------------------------------------------*/

@@ -243,8 +241,7 @@ This is implemented using the DBG `args'

 (defun dbg-args-menu (event)

   (interactive "e")

   (let (selection)

-    (save-excursion

-      (set-buffer (event-buffer event))

+    (with-current-buffer (event-buffer event)

       (save-excursion

 	(goto-char (event-closest-point event))

 	(message "point: %S" (point))

--- bmacs/dbg/dbg-breakpoint.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/dbg/dbg-breakpoint.el	2018-06-17 15:32:42.050634487 -0600

@@ -304,8 +304,7 @@ static char *footprint[] = {

   (let ((proc (get-buffer-process dbg-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

       (goto-char (process-mark proc))

       (process-send-string proc dbg-info-break-command)

       (process-send-string proc "\n"))))

@@ -323,8 +322,7 @@ static char *footprint[] = {

 	  (proc (get-buffer-process dbg-comint-buffer)))

       (or proc (ude-error "Current buffer has no process"))

       ;; Arrange for the current prompt to get deleted.

-      (save-excursion

-	(set-buffer dbg-comint-buffer)

+      (with-current-buffer dbg-comint-buffer

 	(goto-char (process-mark proc))

 	(process-send-string proc command)))))

@@ -533,7 +531,8 @@ static char *footprint[] = {

 	    (set-extent-property extent 'mouse-face 'highlight)

 	    (set-extent-property extent 'dbg-breakpoint bp)

 	    (set-buffer buffer)

-	    (goto-line line)

+	    (goto-char (point-min))

+	    (forward-line (1- line))

 	    (beginning-of-line)

 	    (set-extent-endpoints extent (point) (point))

 	    bp)))))

--- bmacs/dbg/dbg-connect.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/dbg/dbg-connect.el	2018-06-17 15:32:42.050634487 -0600

@@ -157,6 +157,6 @@

 ;*    Disconnect all currently connected buffers.                      */

 ;*---------------------------------------------------------------------*/

 (defun dbg-disconnect-all-buffers ()

-  (mapcar 'dbg-disconnect-buffer dbg-connected-buffers)

+  (mapc 'dbg-disconnect-buffer dbg-connected-buffers)

   (setq dbg-connected-buffers '()))

--- bmacs/dbg/dbg-display.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/dbg/dbg-display.el	2018-06-17 15:32:42.050634487 -0600

@@ -100,8 +100,7 @@ This is implemented using the DBG `displ

   (let ((proc (get-buffer-process dbg-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

       (goto-char (process-mark proc))

       (while (not (looking-at comint-prompt-regexp))

 	(goto-char (process-mark proc))

@@ -140,8 +139,7 @@ This is implemented using the DBG `displ

 ;*    Display a new display in a separate buffer.                      */

 ;*---------------------------------------------------------------------*/

 (defun dbg-display-display (buffer display)

-  (save-excursion

-    (set-buffer buffer)

+  (with-current-buffer buffer

     (let ((buffer-read-only nil))

       (erase-buffer)

       (insert display)

@@ -164,12 +162,12 @@ This is implemented using the DBG `displ

 					 'mouse-face 'highlight

 					 'keymap dbg-display-mouse-map)

 		    (if (< end (point-max))

-			(next-line 1)

+			(forward-line 1)

 		      (setq keep nil)))

 		(progn

 		  (end-of-line)

 		  (if (< (point) (point-max))

-		      (next-line 1)

+		      (forward-line 1)

 		    (setq keep nil)))))))))))

 ;*---------------------------------------------------------------------*/

@@ -248,8 +246,7 @@ This is implemented using the DBG `displ

 (defun dbg-display-menu (event)

   (interactive "e")

   (let (selection)

-    (save-excursion

-      (set-buffer (event-buffer event))

+    (with-current-buffer (event-buffer event)

       (save-excursion

 	(goto-char (event-closest-point event))

 	(message "point: %S" (point))

--- bmacs/dbg/dbg.el.orig	2018-02-04 23:59:28.000000000 -0700

+++ bmacs/dbg/dbg.el	2018-06-17 15:32:42.050634487 -0600

@@ -80,7 +80,12 @@ and source-file directory for your debug

 	  (setq dbg-marker-filter 'dbg-default-marker-filter)

 	  (make-comint dbgname binary nil dbg-emacs-option a.out)

 	  ;; the process filter and sentinel

-	  (process-kill-without-query (get-buffer-process dbg-comint-buffer))

+	  (if (featurep 'xemacs)

+	      (process-kill-without-query

+	       (get-buffer-process dbg-comint-buffer))

+	    (set-process-query-on-exit-flag

+	     (get-buffer-process dbg-comint-buffer)

+	     nil))

 	  (set-process-filter (get-buffer-process dbg-comint-buffer)

 			      'dbg-filter)

 	  (set-process-sentinel (get-buffer-process dbg-comint-buffer)

@@ -203,8 +208,7 @@ and source-file directory for your debug

 	(proc (get-buffer-process dbg-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

       (goto-char (process-mark proc))

       (beginning-of-line)

       (if (looking-at comint-prompt-regexp)

@@ -226,7 +230,7 @@ and source-file directory for your debug

 	(dbg-console-log "dbg-send-input" intxt 'font-lock-type-face)

       (dbg-console-log "dbg-send-input" 'nil 'font-lock-string-face))

     (comint-send-input)

-    (mapcar (lambda (hook) (funcall hook intxt)) dbg-send-input-hooks)

+    (mapc (lambda (hook) (funcall hook intxt)) dbg-send-input-hooks)

     (redisplay-frame)))

 ;*---------------------------------------------------------------------*/

@@ -282,8 +286,7 @@ This is implemented using the DBG `no-ou

 	(proc (get-buffer-process dbg-comint-buffer)))

     (or proc (ude-error "Current buffer has no process"))

     ;; Arrange for the current prompt to get deleted.

-    (save-excursion

-      (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

       (goto-char (process-mark proc))

       (while (not (looking-at comint-prompt-regexp))

 	(goto-char (process-mark proc))

@@ -341,7 +344,7 @@ This is implemented using the DBG `no-ou

   (let ((dbg-mode nil))

     (setq dbg-mode dbg-mode)

     (recenter following)

-    (mapcar (lambda (hook) (funcall hook nil)) dbg-send-input-hooks)

+    (mapc (lambda (hook) (funcall hook nil)) dbg-send-input-hooks)

     (redisplay-frame)))

 ;*---------------------------------------------------------------------*/

@@ -360,11 +363,10 @@ This is implemented using the DBG `no-ou

 (defun dbg-comint-ready-p ()

   (if dbg-waiting

       nil

-    (save-excursion

-      (save-restriction

-	(widen)

-	(progn

-	  (set-buffer dbg-comint-buffer)

+    (with-current-buffer dbg-comint-buffer

+      (save-excursion

+	(save-restriction

+	  (widen)

 	  (goto-char (point-max))

 	  (let ((bound (point)))

 	    (beginning-of-line)

@@ -385,40 +387,39 @@ This is implemented using the DBG `no-ou

 (defun dbg-wait-for-comint (from timeout)

   (if (not dbg-comint-buffer)

       (ude-error "No debugger running")

-    (save-excursion

-      (save-restriction

-	(widen)

-	(let ((count 0)

-	      (str   "/-\\|"))

-	  (setq str str)

-	  (set-buffer dbg-comint-buffer)

-	  ;; we mark dbg waiting

-	  (setq dbg-waiting t)

-	  (accept-process-output)

-	  (while (progn

-		   (goto-char (point-max))

-		   (let ((bound (point)))

-		     (beginning-of-line)

-		     (and (not (re-search-forward (concat

-						   comint-prompt-regexp

-						   "[ \t\n]*")

-						  bound t))

-			  (or (not (numberp timeout))

-			      (< count timeout)))))

-	    (setq count (+ 1 count))

-	    '(display-message 'no-log

-	      (format "waiting for `%s' [%c] (timeout %d/%S)"

-		      from

-		      (aref str (% count 4))

-		      count

-		      timeout))

-	    (sit-for 0.1)

-	    (redisplay-frame (selected-frame) t)

-	    (set-buffer dbg-comint-buffer))

-	  ;; we remove the last wait message

-	  (display-message 'no-log " ")

-	  ;; dbg is now ready

-	  (setq dbg-waiting nil))))))

+    (with-current-buffer dbg-comint-buffer

+      (save-excursion

+	(save-restriction

+	  (widen)

+	  (let ((count 0)

+		(str   "/-\\|"))

+	    ;; we mark dbg waiting

+	    (setq dbg-waiting t)

+	    (accept-process-output)

+	    (while (progn

+		     (goto-char (point-max))

+		     (let ((bound (point)))

+		       (beginning-of-line)

+		       (and (not (re-search-forward (concat

+						     comint-prompt-regexp

+						     "[ \t\n]*")

+						    bound t))

+			    (or (not (numberp timeout))

+				(< count timeout)))))

+	      (setq count (+ 1 count))

+	      '(display-message 'no-log

+		(format "waiting for `%s' [%c] (timeout %d/%S)"

+			from

+			(aref str (% count 4))

+			count

+			timeout))

+	      (sit-for 0.1)

+	      (redisplay-frame (selected-frame) t)