(thai-category-table): Use

[gnu-emacs] / lisp / iswitchb.el

diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 4fa30f9742ee83ef2c258d9b562bf56a206aec61..18142e6f837c570b0d4b02ab5596f8e6fc40a154 100644 (file)
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -208,7 +208,7 @@
     (defmacro defgroup (&rest args)
       nil)
     (defmacro defcustom (var value doc &rest args) 
-      (` (defvar (, var) (, value) (, doc))))))
+      `(defvar ,var ,value ,doc))))
 
 ;;; User Variables
 ;;
@@ -974,10 +974,10 @@ Call this function to override the normal bindings.  This function also
 adds a hook to the minibuffer."
   (interactive)
   (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
-  (global-set-key (read-kbd-macro "C-x b")  'iswitchb-buffer)
-  (global-set-key (read-kbd-macro "C-x 4 b")  'iswitchb-buffer-other-window)
-  (global-set-key (read-kbd-macro "C-x 4 C-o")  'iswitchb-display-buffer)
-  (global-set-key (read-kbd-macro "C-x 5 b")  'iswitchb-buffer-other-frame))
+  (global-set-key "\C-xb" 'iswitchb-buffer)
+  (global-set-key "\C-x4b" 'iswitchb-buffer-other-window)
+  (global-set-key "\C-x4\C-o" 'iswitchb-display-buffer)
+  (global-set-key "\C-x5b" 'iswitchb-buffer-other-frame))
 
 ;;;###autoload
 (defun iswitchb-buffer ()
@@ -1065,7 +1065,7 @@ Copied from `icomplete-exhibit' with two changes:
 2. It calls my completion routine rather than the standard completion."
 
   (if iswitchb-use-mycompletion
-      (let ((contents (buffer-string))
+      (let ((contents (buffer-substring (minibuffer-prompt-end) (point-max)))
            (buffer-undo-list t))
        (save-excursion
          (goto-char (point-max))