Mercurial > emacs
view lisp/mail/blessmail.el @ 65067:52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
(smerge-auto-leave): Make undo re-enable the mode.
(debug-ignored-errors): Add the user-error of impossible resolution.
(smerge-resolve): Move things around a bit, in preparation for later.
(smerge-diff): Don't fail if the buffer has no associated file.
(ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler.
(smerge-conflict-overlay): New function.
(smerge-match-conflict): Don't add text properties here.
(smerge-find-conflict): Instead, add an overlay here.
Also check for the case where we're inside a conflict already, so as to
obviate the need for font-lock-multiline, which is unbearably slow with
large conflicts and ciomplex font-lock patterns.
(smerge-remove-props): Remove overlay rather than text-properties.
(smerge-mode): Don't set font-lock-multiline.
Remove overlays when turned off.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 22 Aug 2005 14:38:51 +0000 |
parents | fafd692d1e40 |
children | 067115a6e738 2d92f5c9d6ae |
line wrap: on
line source
;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- ;; Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This is loaded into a bare Emacs to create the blessmail script, ;; which (on systems that need it) is used during installation ;; to give appropriate permissions to movemail. ;; ;; It has to be done from lisp in order to be sure of getting the ;; correct value of rmail-spool-directory. ;;; Code: ;; These are no longer needed because we run this in emacs instead of temacs. ;; (message "Using load-path %s" load-path) ;; (load "paths.el") ;; It is not safe to load site-init.el here, because it might have things in it ;; that won't load properly unless all the rest of Emacs is loaded. (let ((dirname (directory-file-name rmail-spool-directory)) linkname attr modes) ;; Check for symbolic link (while (setq linkname (file-symlink-p dirname)) (setq dirname (if (file-name-absolute-p linkname) linkname (concat (file-name-directory dirname) linkname)))) (insert "#!/bin/sh\n") (setq attr (file-attributes dirname)) (if (not (eq t (car attr))) (insert (format "echo %s is not a directory\n" rmail-spool-directory)) (setq modes (nth 8 attr)) (cond ((= ?w (aref modes 8)) ;; Nothing needs to be done. ) ((= ?w (aref modes 5)) (insert "chgrp " (number-to-string (nth 3 attr)) " $* && chmod g+s $*\n")) ((= ?w (aref modes 2)) (insert "chown " (number-to-string (nth 2 attr)) " $* && chmod u+s $*\n")) (t (insert "chown root $* && chmod u+s $*\n")))) (insert "echo mail directory = " dirname "\n")) (write-region (point-min) (point-max) "blessmail") (kill-emacs) ;;; arch-tag: c3329fe2-f945-41a9-8b00-b4b038ff182f ;;; blessmail.el ends here