Merge remote-tracking branch 'origin/master' into athena/unstable

1 files changed, 3 insertions, 12 deletions

diff --git a/lisp/master.el b/lisp/master.el
index 796f2189d66..3dcee50c5e0 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -1,4 +1,4 @@
-;;; master.el --- make a buffer the master over another buffer
+;;; master.el --- make a buffer the master over another buffer  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;; master-mode is a minor mode which enables you to scroll another
+;; `master-mode' is a minor mode which enables you to scroll another
 ;; buffer (the slave) without leaving your current buffer (the master).
 
 ;; It can be used by sql.el, for example: The SQL buffer is the master
@@ -47,17 +47,8 @@
 ;;
 ;; Rob Riepel <networking.stanford.edu>
 
-;;; History:
-;;
-
 ;;; Code:
 
-;; Unused.
-;;; (defgroup master nil
-;;;   "Support for master/slave relationships between buffers."
-;;;   :version "22.1"
-;;;   :group 'convenience)
-
 ;; Variables that don't need initialization.
 
 (defvar master-of nil
@@ -93,7 +84,7 @@ yourself the value of `master-of' by calling `master-show-slave'."
 ;; Initialize Master mode by setting a slave buffer.
 
 (defun master-set-slave (buffer)
-  "Makes BUFFER the slave of the current buffer.
+  "Make BUFFER the slave of the current buffer.
 Use \\[master-mode] to toggle control of the slave buffer."
   (interactive "bSlave: ")
   (setq-local master-of buffer)