← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ess/saucy-proposed

« back to all changes in this revision

Viewing changes to lisp/ess-mode.el

  • Committer: Bazaar Package Importer
  • Author(s): Dirk Eddelbuettel
  • Date: 2010-11-08 16:52:27 UTC
  • mfrom: (1.2.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20101108165227-u844l0tlegcdn89k
Tags: 5.12-1
http://bugs.debian.org/594750
* New upstream version released today

* debian/emacen-startup: Follow suggestion by Kevin Ryde in #594750 and
  use debian-pkg-add-load-path-item as well; also improved emacsen-install
  script by using soft links instead of copies  (Closes: #594750)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lisp/ess-mode.el
742
742
  "Insert character and correct line's indentation."
743
743
  (interactive "P")
744
744
;; skeleton-pair takes precedence
745
 
(if (and (boundp 'skeleton-pair) skeleton-pair (fboundp 'skeleton-pair-insert-maybe))
 
745
(if (and (boundp 'skeleton-pair) skeleton-pair (featurep 'skeleton))
746
746
  (skeleton-pair-insert-maybe "{")
747
747
;; else
748
748
  (let (insertpos)
753
753
                   (bolp))
754
754
                 (if ess-auto-newline (progn (ess-indent-line) (newline) t) nil)))
755
755
        (progn
756
 
          (insert last-command-event)
 
756
          (insert (if (featurep 'xemacs) (event-to-character last-command-event) last-command-event))
757
757
          (ess-indent-line)
758
758
          (if ess-auto-newline
759
759
              (progn