emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/progmodes/sql.el


From: Richard M . Stallman
Subject: [Emacs-diffs] Changes to emacs/lisp/progmodes/sql.el
Date: Tue, 09 Aug 2005 07:42:54 -0400

Index: emacs/lisp/progmodes/sql.el
diff -c emacs/lisp/progmodes/sql.el:1.47 emacs/lisp/progmodes/sql.el:1.48
*** emacs/lisp/progmodes/sql.el:1.47    Mon Aug  1 08:37:47 2005
--- emacs/lisp/progmodes/sql.el Tue Aug  9 11:42:54 2005
***************
*** 736,745 ****
  
  (defvar sql-interactive-mode-map
    (let ((map (make-sparse-keymap)))
!     (if (functionp 'set-keymap-parent)
        (set-keymap-parent map comint-mode-map); Emacs
!       (set-keymap-parents map (list comint-mode-map))); XEmacs
!     (if (functionp 'set-keymap-name)
        (set-keymap-name map 'sql-interactive-mode-map)); XEmacs
      (define-key map (kbd "C-j") 'sql-accumulate-and-indent)
      (define-key map (kbd "C-c C-w") 'sql-copy-column)
--- 736,746 ----
  
  (defvar sql-interactive-mode-map
    (let ((map (make-sparse-keymap)))
!     (if (fboundp 'set-keymap-parent)
        (set-keymap-parent map comint-mode-map); Emacs
!       (if (fboundp 'set-keymap-parents)
!         (set-keymap-parents map (list comint-mode-map)))); XEmacs
!     (if (fboundp 'set-keymap-name)
        (set-keymap-name map 'sql-interactive-mode-map)); XEmacs
      (define-key map (kbd "C-j") 'sql-accumulate-and-indent)
      (define-key map (kbd "C-c C-w") 'sql-copy-column)
***************
*** 1901,1916 ****
    (describe-function 'sql-help))
  
  (defun sql-read-passwd (prompt &optional default)
!   "Read a password using PROMPT.
! Optional DEFAULT is password to start with.  This function calls
! `read-passwd' if it is available.  If not, function
! `ange-ftp-read-passwd' is called.  This should always be available,
! even in old versions of Emacs."
!   (if (fboundp 'read-passwd)
!       (read-passwd prompt nil default)
!     (unless (fboundp 'ange-ftp-read-passwd)
!       (autoload 'ange-ftp-read-passwd "ange-ftp"))
!     (ange-ftp-read-passwd prompt default)))
  
  (defun sql-get-login (&rest what)
    "Get username, password and database from the user.
--- 1902,1909 ----
    (describe-function 'sql-help))
  
  (defun sql-read-passwd (prompt &optional default)
!   "Read a password using PROMPT.  Optional DEFAULT is password to start with."
!   (read-passwd prompt nil default))
  
  (defun sql-get-login (&rest what)
    "Get username, password and database from the user.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]