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

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-cmds.el
diff -c emacs/lisp/progmodes/cc-cmds.el:1.36 
emacs/lisp/progmodes/cc-cmds.el:1.37
*** emacs/lisp/progmodes/cc-cmds.el:1.36        Sun Apr 18 22:09:27 2004
--- emacs/lisp/progmodes/cc-cmds.el     Wed Aug 11 16:22:21 2004
***************
*** 479,485 ****
          ;; end up before it.
          (setq delete-temp-newline
                (cons (save-excursion
!                       (c-backward-syntactic-ws)
                        (copy-marker (point) t))
                      (point-marker))))
        (unwind-protect
--- 479,489 ----
          ;; end up before it.
          (setq delete-temp-newline
                (cons (save-excursion
!                       (end-of-line 0)
!                       (if (eq (char-before) ?\\)
!                           ;; Ignore a line continuation.
!                           (backward-char))
!                       (skip-chars-backward " \t")
                        (copy-marker (point) t))
                      (point-marker))))
        (unwind-protect
***************
*** 1971,1978 ****
  If nil, indent the current line only if point is at the left margin or
  in the line's indentation; otherwise insert some whitespace[*].  If
  other than nil or t, then some whitespace[*] is inserted only within
! literals (comments and strings) and inside preprocessor directives,
! but the line is always reindented.
  
  If `c-syntactic-indentation' is t, indentation is done according to
  the syntactic context.  A numeric argument, regardless of its value,
--- 1975,1981 ----
  If nil, indent the current line only if point is at the left margin or
  in the line's indentation; otherwise insert some whitespace[*].  If
  other than nil or t, then some whitespace[*] is inserted only within
! literals (comments and strings), but the line is always reindented.
  
  If `c-syntactic-indentation' is t, indentation is done according to
  the syntactic context.  A numeric argument, regardless of its value,