Simplify dbgr-srcbuf-info field setters

diff --git a/dbgr/common/buffer/source.el b/dbgr/common/buffer/source.el
index c1894d11a276e21a88e2a4794e0f9c910759dabf..dfb7f2c712352c19147c138f0ae7c0086b65a7f2 100644 (file)
--- a/dbgr/common/buffer/source.el
+++ b/dbgr/common/buffer/source.el
@@ -45,11 +45,11 @@ to be debugged."
 
 ;; FIXME: DRY = access via a macro. See also analogous
 ;; code in dbgr-srcbuf
-(defun dbgr-srcbuf-info-was-read-only?=(info value)
-  (setf (dbgr-srcbuf-info-was-read-only? info) value))
+(defun dbgr-srcbuf-info-was-read-only?=(value)
+  (setf (dbgr-srcbuf-info-was-read-only? dbgr-srcbuf-info) value))
 
-(defun dbgr-srcbuf-info-short-key?=(info value)
-  (setf (dbgr-srcbuf-info-short-key? info) value))
+(defun dbgr-srcbuf-info-short-key?=(value)
+  (setf (dbgr-srcbuf-info-short-key? dbgr-srcbuf-info) value))
 
 (defun dbgr-srcbuf-info-set? ()
   "Return true if `dbgr-srcbuf-info' is set."
@@ -76,14 +76,14 @@ to be debugged."
     (dbgr-sget 'srcbuf-info 'loc-hist))
 )
 ;; FIXME: DRY = access via a macro
-(defun dbgr-srcbuf-info-cmdproc=(info buffer)
-  (setf (dbgr-srcbuf-info-cmdproc info) buffer))
+(defun dbgr-srcbuf-info-cmdproc=(buffer)
+  (setf (dbgr-srcbuf-info-cmdproc dbgr-srcbuf-info) buffer))
 
-(defun dbgr-srcbuf-info-debugger-name=(info value)
-  (setf (dbgr-srcbuf-info-debugger-name info) value))
+(defun dbgr-srcbuf-info-debugger-name=(value)
+  (setf (dbgr-srcbuf-info-debugger-name dbgr-srcbuf-info) value))
 
-(defun dbgr-srcbuf-info-cmd-args=(info buffer)
-  (setf (dbgr-srcbuf-info-cmd-args info) buffer))
+(defun dbgr-srcbuf-info-cmd-args=(buffer)
+  (setf (dbgr-srcbuf-info-cmd-args dbgr-srcbuf-info) buffer))
 
 (declare-function fn-p-to-fn?-alias(sym))
 (fn-p-to-fn?-alias 'dbgr-srcbuf-info-p)
@@ -126,9 +126,9 @@ in it with those from CMDPROC-BUFFER"
      (or (current-local-map) (use-local-map (make-sparse-keymap))))
     (if (dbgr-srcbuf-info? dbgr-srcbuf-info)
        (progn
-         (dbgr-srcbuf-info-cmdproc= dbgr-srcbuf-info cmdproc-buffer)
-         (dbgr-srcbuf-info-debugger-name= dbgr-srcbuf-info debugger-name)
-         (dbgr-srcbuf-info-cmd-args= dbgr-srcbuf-info cmd-args)
+         (dbgr-srcbuf-info-cmdproc= cmdproc-buffer)
+         (dbgr-srcbuf-info-debugger-name= debugger-name)
+         (dbgr-srcbuf-info-cmd-args= cmd-args)
          )
       (dbgr-srcbuf-init src-buffer cmdproc-buffer "unknown" nil)))))
 

diff --git a/dbgr/common/shortkey.el b/dbgr/common/shortkey.el
index f3e0bfe36701d406b07c5da003321efc986cda67..6c96a72a58a3e4a72ca895ac1accc8592f6444f7 100644 (file)
--- a/dbgr/common/shortkey.el
+++ b/dbgr/common/shortkey.el
@@ -63,15 +63,14 @@ MODE-ON? a boolean which specifies if we are going into or out of this mode."
          (if mode-on?
              ;; Mode is being turned on.
              (progn
-               (dbgr-srcbuf-info-was-read-only?=  
-                dbgr-srcbuf-info buffer-read-only)
+               (dbgr-srcbuf-info-was-read-only?= buffer-read-only)
                (local-set-key [M-insert] 'dbgr-short-key-mode)
                (setq buffer-read-only t))
            ;; Mode is being turned off: restore read-only state.
            (setq buffer-read-only (dbgr-sget 'srcbuf-info 'was-read-only?)))
          ;; Save the current state, so we can determine when the
          ;; state is toggled in the future.
-         (dbgr-srcbuf-info-short-key?= dbgr-srcbuf-info mode-on?)
+         (dbgr-srcbuf-info-short-key?= mode-on?)
          (setq dbgr-short-key-mode mode-on?))
        ;; (with-current-buffer-safe cmdbuf
        ;;   (dbgr-cmdbuf-info-src-shortkey?= mode-on?)