This commit was generated by cvs2svn to compensate for changes in r775,

[chise/xemacs-chise.git.1] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 8a78f9d..34bcde7 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -433,7 +433,7 @@ and KILLP is t if a prefix arg was specified."
   (and overwrite-mode (not (eolp))
        (save-excursion (insert-char ?\  arg))))
 
-(defcustom delete-key-deletes-forward nil
+(defcustom delete-key-deletes-forward t
   "*If non-nil, the DEL key will erase one character forwards.
 If nil, the DEL key will erase one character backwards."
   :type 'boolean
@@ -2592,7 +2592,8 @@ indicating whether soft newlines should be inserted.")
                       bounce
                       ;; 97/3/14 jhod: Kinsoku
                       (re-break-point (if (featurep 'mule)
-                                           (concat "[ \t\n]\\|" word-across-newline)
+                                           (concat "[ \t\n]\\|" word-across-newline
+                                                   ".\\|." word-across-newline)
                                        "[ \t\n]"))
                       ;; end patch
                       (first t))
@@ -2655,20 +2656,23 @@ indicating whether soft newlines should be inserted.")
                  (if (save-excursion
                        (skip-chars-backward " \t")
                        (= (point) fill-point))
+                     ;; 1999-09-17 hniksic: turn off Kinsoku until
+                     ;; it's debugged.
+                     (indent-new-comment-line)
                      ;; 97/3/14 jhod: Kinsoku processing
-                     ;(indent-new-comment-line)
-                     (let ((spacep (memq (char-before (point)) '(?\  ?\t))))
-                       (funcall comment-line-break-function)
-                       ;; if user type space explicitly, leave SPC
-                       ;; even if there is no WAN.
-                       (if spacep
-                           (save-excursion
-                             (goto-char fill-point)
-                             ;; put SPC except that there is SPC
-                             ;; already or there is sentence end.
-                             (or (memq (char-after (point)) '(?\  ?\t))
-                                 (fill-end-of-sentence-p)
-                                 (insert ?\ )))))
+;                    ;(indent-new-comment-line)
+;                    (let ((spacep (memq (char-before (point)) '(?\  ?\t))))
+;                      (funcall comment-line-break-function)
+;                      ;; if user type space explicitly, leave SPC
+;                      ;; even if there is no WAN.
+;                      (if spacep
+;                          (save-excursion
+;                            (goto-char fill-point)
+;                            ;; put SPC except that there is SPC
+;                            ;; already or there is sentence end.
+;                            (or (memq (char-after (point)) '(?\  ?\t))
+;                                (fill-end-of-sentence-p)
+;                                (insert ?\ )))))
                    (save-excursion
                      (goto-char fill-point)
                      (funcall comment-line-break-function)))
@@ -2889,6 +2893,7 @@ unless optional argument SOFT is non-nil."
       (if (and comcol (not fill-prefix))  ; XEmacs - (ENE) from fa-extras.
          (let ((comment-column comcol)
                (comment-start comstart)
+               (block-comment-start comstart)
                (comment-end comment-end))
            (and comment-end (not (equal comment-end ""))
   ;           (if (not comment-multi-line)