comparison lisp/progmodes/cpp.el @ 16681:58b38425b463

(cpp-edit-load): Don't load anything if init-file-user is nil. (cpp-edit-save): Doc fix.
author Richard M. Stallman <rms@gnu.org>
date Sun, 15 Dec 1996 07:30:24 +0000
parents 2b2e0cef30d5
children 4d91d1db7ac0
comparison
equal deleted inserted replaced
16680:82898b671633 16681:58b38425b463
508 (goto-char pos))) 508 (goto-char pos)))
509 509
510 (defun cpp-edit-load () 510 (defun cpp-edit-load ()
511 "Load cpp configuration." 511 "Load cpp configuration."
512 (interactive) 512 (interactive)
513 (cond ((file-readable-p cpp-config-file) 513 (cond ((null init-file-user)
514 ;; If -q was specified, don't load any init files.
515 nil)
516 ((file-readable-p cpp-config-file)
514 (load-file cpp-config-file)) 517 (load-file cpp-config-file))
515 ((file-readable-p (concat "~/" cpp-config-file)) 518 ((file-readable-p (concat "~/" cpp-config-file))
516 (load-file cpp-config-file))) 519 (load-file cpp-config-file)))
517 (if (eq major-mode 'cpp-edit-mode) 520 (if (eq major-mode 'cpp-edit-mode)
518 (cpp-edit-reset))) 521 (cpp-edit-reset)))
519 522
520 (defun cpp-edit-save () 523 (defun cpp-edit-save ()
521 "Load cpp configuration." 524 "Save the current cpp configuration in a file."
522 (interactive) 525 (interactive)
523 (require 'pp) 526 (require 'pp)
524 (save-excursion 527 (save-excursion
525 (set-buffer cpp-edit-buffer) 528 (set-buffer cpp-edit-buffer)
526 (let ((buffer (find-file-noselect cpp-config-file))) 529 (let ((buffer (find-file-noselect cpp-config-file)))